Merge pull request #30 from arenadata/feature/HADOOP-19674-backport

fix(client-runtime): bundle jaxb-runtime so shaded JaxbAnnotationIntrospector resolves on JDK 11+

Author: Asmoday

LICENSE-binary

@@ -525,6 +525,13 @@ javax.ws.rs:jsr311-api:1.1.1
 javax.xml.bind:jaxb-api:2.2.11
 
 
+Eclipse Distribution License (EDL) 1.0
+--------------------------
+
+jakarta.xml.bind:jakarta.xml.bind-api:2.3.3
+org.glassfish.jaxb:jaxb-runtime:2.3.9
+
+
 Eclipse Public License 1.0
 --------------------------
 

hadoop-client-modules/hadoop-client-minicluster/pom.xml

@@ -709,6 +709,13 @@
                       <exclude>org.bouncycastle:*</exclude>
                       <!-- Leave snappy that includes native methods which cannot be relocated. -->
                       <exclude>org.xerial.snappy:*</exclude>
+                      <!-- jaxb and its transitives are bundled (relocated) into
+                           hadoop-client-runtime; don't duplicate them here. -->
+                      <exclude>org.glassfish.jaxb:*</exclude>
+                      <exclude>jakarta.xml.bind:*</exclude>
+                      <exclude>com.sun.xml.bind:*</exclude>
+                      <exclude>com.sun.istack:*</exclude>
+                      <exclude>com.sun.activation:*</exclude>
                     </excludes>
                   </artifactSet>
                   <filters>

hadoop-client-modules/hadoop-client-runtime/pom.xml

@@ -99,6 +99,18 @@
       <artifactId>jsr305</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <!-- jackson-module-jaxb-annotations (bundled and relocated by shade) references
+         javax.xml.bind.* annotations. javax.xml.bind:jaxb-api is excluded above, and
+         JDK 11+ removed it. Bundle jaxb-runtime so its transitive jakarta-xml-bind-api
+         2.3.x (which still ships classes under the javax.xml.bind package) is shaded
+         into this jar, satisfying the relocated references. Optional so downstream
+         consumers don't pick up the (already-bundled) transitives. -->
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <scope>runtime</scope>
+      <optional>true</optional>
+    </dependency>
     <!-- Move log4j to optional, since it is needed for some pieces folks might not use:
          * one of the three custom log4j appenders we have
       -->

hadoop-project/pom.xml

@@ -68,6 +68,9 @@
     <!-- jersey version -->
     <jersey.version>1.19.4</jersey.version>
 
+    <!-- jaxb version -->
+    <jaxb.version>2.3.9</jaxb.version>
+
     <!-- jackson versions -->
     <jackson2.version>2.18.6</jackson2.version>
     <jackson2.databind.version>2.18.6</jackson2.databind.version>
@@ -2178,6 +2181,11 @@
         <artifactId>cache-api</artifactId>
         <version>${cache.api.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.glassfish.jaxb</groupId>
+        <artifactId>jaxb-runtime</artifactId>
+        <version>${jaxb.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>