From c4c4e9e790460213b7c45e7dbd288e30817fc7b5 Mon Sep 17 00:00:00 2001 From: Sakthi Date: Thu, 2 May 2019 13:37:31 -0700 Subject: [PATCH] HBASE-22345: Rest Server throws NoClassDefFoundError : javax/annotation/Priority on JDK8/JDK8 --- hbase-assembly/src/main/assembly/client.xml | 1 - hbase-assembly/src/main/assembly/hadoop-two-compat.xml | 1 - hbase-protocol-shaded/pom.xml | 3 ++- hbase-shaded/hbase-shaded-client/pom.xml | 6 +++--- hbase-shaded/pom.xml | 6 +++--- pom.xml | 10 +++++----- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/hbase-assembly/src/main/assembly/client.xml b/hbase-assembly/src/main/assembly/client.xml index acaea0d4e8994c6a4f18188c6862e68c4f2b1af4..884ac2a2cbfb4334beaf9e0ca923e6deca717c66 100644 --- a/hbase-assembly/src/main/assembly/client.xml +++ b/hbase-assembly/src/main/assembly/client.xml @@ -44,7 +44,6 @@ - javax.annotation:javax.annotation-api com.sun.xml.ws:jaxws-ri org.jruby:jruby-complete diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml index 9aada987189d11cddf0abf90c7ac682e9cf5fed2..05e2fc9565266e4b8f08167e8d58a026d1cbb77e 100644 --- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml @@ -67,7 +67,6 @@ - javax.annotation:javax.annotation-api com.sun.xml.ws:jaxws-ri org.jruby:jruby-complete diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index 3cf9d32f1cf601694b4cb76358c824a614a715da..749c63decf9e6d2bff9a146ca61c5817c5619f9c 100644 --- a/hbase-protocol-shaded/pom.xml +++ b/hbase-protocol-shaded/pom.xml @@ -162,7 +162,8 @@ - + javax.annotation:javax.annotation-api diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml index 96602d3d029f72c268054362fb0bcbcbef9e9487..414ddab5918d9c25a9566f232b36768fae9e6180 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -54,9 +54,9 @@ - - javax.annotation:javax.annotation-api - + javax.activation:javax.activation-api - javax.annotation:javax.annotation-api - + javax.activation:javax.activation-api diff --git a/pom.xml b/pom.xml index 11b3df4dcc49898ecaf84eb5ff024d2c57c9247e..ee85e939fbfaf70472554738ce38d90fed6639a3 100755 --- a/pom.xml +++ b/pom.xml @@ -1991,6 +1991,11 @@ javax.activation 1.2.0 + + javax.annotation + javax.annotation-api + 1.2 + org.eclipse.jetty jetty-server @@ -2304,11 +2309,6 @@ - - javax.annotation - javax.annotation-api - 1.3.2 - com.sun.xml.ws jaxws-ri -- 2.20.1 (Apple Git-117)