From 68f14c19ff79e36b17e99c7e848c19ce5e0164d5 Mon Sep 17 00:00:00 2001
From: Sakthi <sakthivel.azhaku@gmail.com>
Date: Thu, 2 May 2019 13:37:31 -0700
Subject: [PATCH] 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 <busbey@apache.org>
---
 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 acaea0d4e89..884ac2a2cbf 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 9aada987189..05e2fc95652 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 @@
           <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 3cf9d32f1cf..749c63decf9 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 96602d3d029..414ddab5918 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 478ab59f542..976446838a3 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 11b3df4dcc4..ee85e939fbf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1991,6 +1991,11 @@
         <artifactId>javax.activation</artifactId>
         <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>
@@ -2304,11 +2309,6 @@
       </activation>
       <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>