You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2019/05/03 16:25:22 UTC
[hbase] branch branch-2 updated: HBASE-22345 REST Server must have
specific version of javax.annotations available at runtime
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 1e69d56 HBASE-22345 REST Server must have specific version of javax.annotations available at runtime
1e69d56 is described below
commit 1e69d56dfb7faccf69ddd44a8d40bcbdfec27563
Author: Sakthi <sa...@gmail.com>
AuthorDate: Thu May 2 13:37:31 2019 -0700
HBASE-22345 REST Server must have specific version of javax.annotations available at runtime
Rest Server throws NoClassDefFoundError : javax/annotation/Priority after buiding with JDK8 and running on JDK8
Signed-off-by: Sean Busbey <bu...@apache.org>
(cherry picked from commit 68f14c19ff79e36b17e99c7e848c19ce5e0164d5)
---
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 acaea0d..884ac2a 100644
--- a/hbase-assembly/src/main/assembly/client.xml
+++ b/hbase-assembly/src/main/assembly/client.xml
@@ -44,7 +44,6 @@
<dependencySet>
<excludes>
<!-- Exclude J2EE libraries that get pulled in when building on JDK11 -->
- <exclude>javax.annotation:javax.annotation-api</exclude>
<exclude>com.sun.xml.ws:jaxws-ri</exclude>
<!-- Exclude libraries that we put in their own dirs under lib/ -->
<exclude>org.jruby:jruby-complete</exclude>
diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
index feb6e2a..d6bc91d 100644
--- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
@@ -65,7 +65,6 @@
<dependencySet>
<excludes>
<!-- Exclude J2EE libraries that get pulled in when building on JDK11 -->
- <exclude>javax.annotation:javax.annotation-api</exclude>
<exclude>com.sun.xml.ws:jaxws-ri</exclude>
<!-- Exclude libraries that we put in their own dirs under lib/ -->
<exclude>org.jruby:jruby-complete</exclude>
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index d3bd730..66e4dca 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -162,7 +162,8 @@
</relocations>
<artifactSet>
<excludes>
- <!-- exclude J2EE modules that come in for JDK11+ -->
+ <!-- exclude J2EE modules that come in for JDK11+ or modules that come in for
+ JDK8+ but need not be included -->
<exclude>javax.annotation:javax.annotation-api</exclude>
<!--Exclude protobuf itself. We get a patched version from hbase-thirdparty.
-->
diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml
index e838df2..17ca0cc 100644
--- a/hbase-shaded/hbase-shaded-client/pom.xml
+++ b/hbase-shaded/hbase-shaded-client/pom.xml
@@ -54,9 +54,9 @@
<configuration>
<artifactSet>
<excludes>
- <!-- exclude J2EE modules that come in for JDK11+ -->
- <exclude>javax.annotation:javax.annotation-api</exclude>
- <!-- exclude J2EE modules that come in for JDK11+ (since hadoop-3.2.0) -->
+ <!-- exclude J2EE modules that come in for JDK11+ (since
+ hadoop-3.2.0) or modules that come in for JDK8+ but
+ need not be included -->
<exclude>javax.activation:javax.activation-api</exclude>
<!--
Tell the shade plugin that in this case we want to include hadoop
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index f704860..e6faab4 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -132,9 +132,9 @@
<shadeTestJar>false</shadeTestJar>
<artifactSet>
<excludes>
- <!-- exclude J2EE modules that come in for JDK11+ -->
- <exclude>javax.annotation:javax.annotation-api</exclude>
- <!-- exclude J2EE modules that come in for JDK11+ (since hadoop-3.2.0) -->
+ <!-- exclude J2EE modules that come in for JDK11+ (since
+ hadoop-3.2.0) or modules that come in for JDK8+ but
+ need not be included -->
<exclude>javax.activation:javax.activation-api</exclude>
<!-- default to excluding Hadoop, have module that want
to include it redefine the exclude list -->
diff --git a/pom.xml b/pom.xml
index b803fab..751c293 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1851,6 +1851,11 @@
<version>1.2.0</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
@@ -2164,11 +2169,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-ri</artifactId>
<version>2.3.1</version>