From 4ec3eb45cfc61643a984806dd17c014e05caf6e3 Mon Sep 17 00:00:00 2001
From: Andrew Purtell <apurtell@apache.org>
Date: Tue, 1 Feb 2022 17:19:41 -0800
Subject: [PATCH] HBASE-26717 [hbase-thirdparty] hbase-shaded-jersey packages
 unshaded classes

---
 hbase-http/pom.xml                                 |  8 ++++++++
 .../src/main/resources/META-INF/LICENSE.vm         |  2 +-
 hbase-shaded/hbase-shaded-client/pom.xml           | 13 ++++++++-----
 hbase-shaded/hbase-shaded-testing-util/pom.xml     | 10 +++++++---
 hbase-shaded/pom.xml                               | 11 +++++++----
 pom.xml                                            | 14 ++++++++++++++
 6 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml
index f42e3244f528..cc29081d3583 100644
--- a/hbase-http/pom.xml
+++ b/hbase-http/pom.xml
@@ -272,6 +272,14 @@
           <groupId>javax.xml.bind</groupId>
           <artifactId>jaxb-api</artifactId>
         </dependency>
+        <dependency>
+          <groupId>jakarta.xml.bind</groupId>
+          <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>jakarta.activation</groupId>
+          <artifactId>jakarta.activation-api</artifactId>
+        </dependency>
       </dependencies>
     </profile>
     <!-- Needs to make the profile in apache parent pom -->
diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
index ac7c4a75e436..58c384e0fe88 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1343,7 +1343,7 @@ You can redistribute it and/or modify it under either the terms of the
 ## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html
 ##
 ## NB: This list is later compared as lower-case. New entries must also be all lower-case
-#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5', 'apache-2.0' ])
+#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5', 'apache-2.0', 'edl 1.0' ])
 ## include LICENSE sections for anything not under ASL2.0
 #foreach( ${dep} in ${projects} )
 ## if there are no licenses we'll fail the build later, so
diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml
index 885e158ec75e..be28672cab49 100644
--- a/hbase-shaded/hbase-shaded-client/pom.xml
+++ b/hbase-shaded/hbase-shaded-client/pom.xml
@@ -54,15 +54,18 @@
             <configuration>
               <artifactSet>
                 <excludes>
-                  <!-- exclude J2EE modules that come in for JDK11+ (since
+                  <!-- 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.annotation:javax.annotation-api</exclude>
-                  <exclude>javax.activation:javax.activation-api</exclude>
-                  <exclude>jakarta.activation:jakarta.activation-api</exclude> <!-- Hadoop 3.3.1 -->
-                  <exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
+                  <exclude>com.sun.activation:jakarta.activation</exclude>
+                  <exclude>com.sun.xml.bind:jaxb-osgi</exclude>
+                  <exclude>jakarta.activation:jakarta.activation-api</exclude>
                   <exclude>jakarta.annotation:jakarta.annotation-api</exclude>
                   <exclude>jakarta.validation:jakarta.validation-api</exclude>
+                  <exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
+                  <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
+                  <exclude>javax.activation:javax.activation-api</exclude>
+                  <exclude>javax.annotation:javax.annotation-api</exclude>
                   <exclude>org.glassfish.hk2.external:jakarta.inject</exclude>
                   <!--
                     Tell the shade plugin that in this case we want to include hadoop
diff --git a/hbase-shaded/hbase-shaded-testing-util/pom.xml b/hbase-shaded/hbase-shaded-testing-util/pom.xml
index 518704d4a80e..f2147a12c117 100644
--- a/hbase-shaded/hbase-shaded-testing-util/pom.xml
+++ b/hbase-shaded/hbase-shaded-testing-util/pom.xml
@@ -170,11 +170,15 @@
                   <!-- 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.annotation:javax.annotation-api</exclude>
-                  <exclude>javax.activation:javax.activation-api</exclude>
-                  <exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
+                  <exclude>com.sun.activation:jakarta.activation</exclude>
+                  <exclude>com.sun.xml.bind:jaxb-osgi</exclude>
+                  <exclude>jakarta.activation:jakarta.activation-api</exclude>
                   <exclude>jakarta.annotation:jakarta.annotation-api</exclude>
                   <exclude>jakarta.validation:jakarta.validation-api</exclude>
+                  <exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
+                  <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
+                  <exclude>javax.activation:javax.activation-api</exclude>
+                  <exclude>javax.annotation:javax.annotation-api</exclude>
                   <exclude>org.glassfish.hk2.external:jakarta.inject</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 0e67ce1e2dc1..e5386d01e869 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -144,12 +144,15 @@
                     <!-- 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.annotation:javax.annotation-api</exclude>
-                    <exclude>javax.activation:javax.activation-api</exclude>
-                    <exclude>jakarta.activation:jakarta.activation-api</exclude> <!-- Hadoop 3.3.1 -->
-                    <exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
+                    <exclude>com.sun.activation:jakarta.activation</exclude>
+                    <exclude>com.sun.xml.bind:jaxb-osgi</exclude>
+                    <exclude>jakarta.activation:jakarta.activation-api</exclude>
                     <exclude>jakarta.annotation:jakarta.annotation-api</exclude>
                     <exclude>jakarta.validation:jakarta.validation-api</exclude>
+                    <exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
+                    <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
+                    <exclude>javax.activation:javax.activation-api</exclude>
+                    <exclude>javax.annotation:javax.annotation-api</exclude>
                     <exclude>org.glassfish.hk2.external:jakarta.inject</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 8e844b0706ce..24364c630139 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1829,6 +1829,9 @@
     <xz.version>1.9</xz.version>
     <zstd-jni.version>1.5.0-4</zstd-jni.version>
     <hbase-thirdparty.version>4.0.1</hbase-thirdparty.version>
+    <!-- jdk11 dependencies for hbase-http -->
+    <jakarta-activation.version>2.0.1</jakarta-activation.version>
+    <jakarta-xml-bind.version>3.0.1</jakarta-xml-bind.version>
     <!-- Intraproject jar naming properties -->
     <!-- TODO this is pretty ugly, but works for the moment.
       Modules are pretty heavy-weight things, so doing this work isn't too bad. -->
@@ -2620,6 +2623,17 @@
         <artifactId>zstd-jni</artifactId>
         <version>${zstd-jni.version}</version>
       </dependency>
+      <!-- jdk11 dependencies for hbase-http -->
+      <dependency>
+        <groupId>jakarta.activation</groupId>
+        <artifactId>jakarta.activation-api</artifactId>
+        <version>${jakarta-activation.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>${jakarta-xml-bind.version}</version>
+      </dependency>
       <!-- shaded thirdparty -->
       <dependency>
         <groupId>org.apache.hbase.thirdparty</groupId>