HBASE-26717 [hbase-thirdparty] hbase-shaded-jersey packages unshaded classes

Author: apurtell

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 -->

hbase-shaded/hbase-shaded-client/pom.xml

@@ -54,15 +54,17 @@
             <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.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

hbase-shaded/hbase-shaded-testing-util/pom.xml

@@ -170,11 +170,14 @@
                   <!-- 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.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

hbase-shaded/pom.xml

@@ -144,12 +144,14 @@
                     <!-- 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.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 -->

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>