From da92d016c41261746967134414d82792b09b7a35 Mon Sep 17 00:00:00 2001 From: stack Date: Thu, 23 Apr 2020 22:22:35 -0700 Subject: [PATCH] HBASE-24215 [Flakey Tests] [ERROR] TestSecureRESTServer java.lang.NoClassDefFoundError: com/sun/jersey/core/spi/factory/AbstractRuntimeDelegate Second attempt. Made the hadoop3 profile in top-level pom same as it is for hadoop2 when it comes to exclusions. Then backed out previous attempt mostly. Made the failing test medium-sized so it ran in its own jvm. --- hbase-rest/pom.xml | 42 ++----------------- .../hbase/rest/TestSecureRESTServer.java | 4 +- pom.xml | 12 ++++++ 3 files changed, 17 insertions(+), 41 deletions(-) diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 209d22a08d..6dd7bddc1b 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -210,27 +210,11 @@ + this build at assembly time. See HBASE-22029 --> com.sun.jersey jersey-core - - com.sun.jersey - jersey-client - - - com.sun.jersey - jersey-server - - - com.sun.jersey - jersey-json - - - com.sun.jersey.contribs - jersey-guice - @@ -427,10 +411,6 @@ com.google.guava guava - - com.sun.jersey - jersey-server - @@ -510,24 +490,8 @@ test - com.sun.jersey - jersey-client - - - - com.sun.jersey.contribs - jersey-guice - - - com.sun.jersey - jersey-server + com.google.guava + guava diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecureRESTServer.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecureRESTServer.java index 58f7c1078b..01d81c2226 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecureRESTServer.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecureRESTServer.java @@ -56,8 +56,8 @@ import org.apache.hadoop.hbase.security.access.AccessControlConstants; import org.apache.hadoop.hbase.security.access.AccessController; import org.apache.hadoop.hbase.security.access.Permission.Action; import org.apache.hadoop.hbase.security.token.TokenProvider; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MiscTests; -import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hdfs.DFSConfigKeys; @@ -101,7 +101,7 @@ import org.slf4j.LoggerFactory; * Test class for SPNEGO authentication on the HttpServer. Uses Kerby's MiniKDC and Apache * HttpComponents to verify that a simple Servlet is reachable via SPNEGO and unreachable w/o. */ -@Category({MiscTests.class, SmallTests.class}) +@Category({MiscTests.class, MediumTests.class}) public class TestSecureRESTServer { @ClassRule diff --git a/pom.xml b/pom.xml index a04ab95cd0..f5bb0ae4ed 100755 --- a/pom.xml +++ b/pom.xml @@ -2892,6 +2892,10 @@ io.netty netty + + javax.servlet + servlet-api + javax.inject javax.inject @@ -2923,6 +2927,10 @@ io.netty netty + + javax.servlet + servlet-api + @@ -2940,6 +2948,10 @@ io.netty netty + + javax.servlet + servlet-api + -- 2.19.1