From f25e85907710ebb97f9fd5918cd34570ed404ed5 Mon Sep 17 00:00:00 2001
From: Mario Fusco <mario.fusco@gmail.com>
Date: Tue, 5 Apr 2022 10:21:54 +0200
Subject: [PATCH] [DROOLS-6853] jdk17 compatibility (#2736)

* wip

* - Exclude com.sun.xml.bind:jaxb-impl in test scope to avoid BanDuplicateClasses
- Add glassfish jaxb-runtime and jaxb-xjc in kie-server war

* - Exclude com.sun.xml.bind:jaxb-impl and jaxb-core to avoid BanDuplicateClasses

Co-authored-by: Toshiya Kobayashi <toshiyakobayashi@gmail.com>
---
 .../camel-container-tests-module/pom.xml      | 10 ++++++
 kie-camel/pom.xml                             | 36 ++++++++++++-------
 kie-maven-plugin/pom.xml                      | 12 +++----
 kie-plugins-testing/pom.xml                   | 10 +++---
 kie-server-parent/kie-server-api/pom.xml      |  8 ++---
 .../kie-server-client/pom.xml                 |  8 ++---
 .../kie-server-rest-case-mgmt/pom.xml         |  4 +--
 .../kie-server-services-common/pom.xml        |  4 +--
 .../kie-server-integ-tests-dmn/pom.xml        |  6 ++++
 .../kie-server-wars/kie-server/pom.xml        |  2 +-
 .../main/assembly/assembly-ee7-container.xml  |  3 +-
 .../main/assembly/assembly-ee8-container.xml  |  3 +-
 .../assembly/assembly-servlet-container.xml   |  3 ++
 .../jbpm-spring-boot-sample-basic/pom.xml     |  8 ++---
 kie-spring/pom.xml                            | 12 ++-----
 kie-takari-plugin/pom.xml                     | 12 +++----
 16 files changed, 80 insertions(+), 61 deletions(-)

diff --git a/camel-container-tests/camel-container-tests-module/pom.xml b/camel-container-tests/camel-container-tests-module/pom.xml
index d66ea4f102..e658368b82 100644
--- a/camel-container-tests/camel-container-tests-module/pom.xml
+++ b/camel-container-tests/camel-container-tests-module/pom.xml
@@ -29,6 +29,16 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+        </exclusion>
+      </exclusions>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/kie-camel/pom.xml b/kie-camel/pom.xml
index 0a4ed2e8ce..caa95590e9 100644
--- a/kie-camel/pom.xml
+++ b/kie-camel/pom.xml
@@ -44,13 +44,12 @@
     </dependency>
 
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-core</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-xjc</artifactId>
     </dependency>
 
     <dependency>
@@ -95,6 +94,16 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -137,13 +146,6 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-xjc</artifactId>
-      <scope>runtime</scope>
-      <optional>true</optional>
-    </dependency>
-
     <dependency>
       <groupId>org.jbpm</groupId>
       <artifactId>jbpm-flow</artifactId>
@@ -197,6 +199,16 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jaxb</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
diff --git a/kie-maven-plugin/pom.xml b/kie-maven-plugin/pom.xml
index d523fc6428..02b331cc15 100644
--- a/kie-maven-plugin/pom.xml
+++ b/kie-maven-plugin/pom.xml
@@ -248,16 +248,12 @@
           <artifactId>jakarta.activation-api</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-core</artifactId>
+          <groupId>org.glassfish.jaxb</groupId>
+          <artifactId>jaxb-runtime</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-impl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jakarta.xml.bind</groupId>
-          <artifactId>jakarta.xml.bind-api</artifactId>
+          <groupId>org.glassfish.jaxb</groupId>
+          <artifactId>jaxb-xjc</artifactId>
         </exclusion>
       </exclusions>
       <scope>runtime</scope>
diff --git a/kie-plugins-testing/pom.xml b/kie-plugins-testing/pom.xml
index 36891ff05a..9ebc1df9da 100644
--- a/kie-plugins-testing/pom.xml
+++ b/kie-plugins-testing/pom.xml
@@ -66,14 +66,14 @@
     </dependency>
 
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-core</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-xjc</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.kie</groupId>
       <artifactId>kie-ci</artifactId>
diff --git a/kie-server-parent/kie-server-api/pom.xml b/kie-server-parent/kie-server-api/pom.xml
index 6221500067..17c13ac88b 100644
--- a/kie-server-parent/kie-server-api/pom.xml
+++ b/kie-server-parent/kie-server-api/pom.xml
@@ -133,13 +133,13 @@
     </dependency>
 
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-core</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-xjc</artifactId>
       <scope>test</scope>
     </dependency>
     <!-- TRUSTY -->
diff --git a/kie-server-parent/kie-server-remote/kie-server-client/pom.xml b/kie-server-parent/kie-server-remote/kie-server-client/pom.xml
index 0dab9621b9..7b069a9405 100644
--- a/kie-server-parent/kie-server-remote/kie-server-client/pom.xml
+++ b/kie-server-parent/kie-server-remote/kie-server-client/pom.xml
@@ -87,12 +87,12 @@
 
     <!-- jaxb -->
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-core</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-xjc</artifactId>
     </dependency>
 
     <!-- Test dependencies -->
diff --git a/kie-server-parent/kie-server-remote/kie-server-rest/kie-server-rest-case-mgmt/pom.xml b/kie-server-parent/kie-server-remote/kie-server-rest/kie-server-rest-case-mgmt/pom.xml
index 7af241382a..db9748d1d0 100644
--- a/kie-server-parent/kie-server-remote/kie-server-rest/kie-server-rest-case-mgmt/pom.xml
+++ b/kie-server-parent/kie-server-remote/kie-server-rest/kie-server-rest-case-mgmt/pom.xml
@@ -60,8 +60,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-core</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/kie-server-parent/kie-server-services/kie-server-services-common/pom.xml b/kie-server-parent/kie-server-services/kie-server-services-common/pom.xml
index 3764cb8977..20426634f3 100644
--- a/kie-server-parent/kie-server-services/kie-server-services-common/pom.xml
+++ b/kie-server-parent/kie-server-services/kie-server-services-common/pom.xml
@@ -203,8 +203,8 @@
     </dependency>
 
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-core</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-dmn/pom.xml b/kie-server-parent/kie-server-tests/kie-server-integ-tests-dmn/pom.xml
index f4b8b64e91..40bdc1f187 100644
--- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-dmn/pom.xml
+++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-dmn/pom.xml
@@ -46,6 +46,12 @@
       <groupId>io.rest-assured</groupId>
       <artifactId>rest-assured</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     
     <!-- Logging -->
diff --git a/kie-server-parent/kie-server-wars/kie-server/pom.xml b/kie-server-parent/kie-server-wars/kie-server/pom.xml
index 891e67a446..4113325e40 100644
--- a/kie-server-parent/kie-server-wars/kie-server/pom.xml
+++ b/kie-server-parent/kie-server-wars/kie-server/pom.xml
@@ -344,7 +344,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
+      <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-xjc</artifactId>
     </dependency>
 
diff --git a/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-ee7-container.xml b/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-ee7-container.xml
index e51747aee8..41d775f059 100644
--- a/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-ee7-container.xml
+++ b/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-ee7-container.xml
@@ -93,7 +93,8 @@
         
         <include>xerces:xercesImpl</include>
 
-	<include>com.sun.xml.bind:jaxb-xjc</include>
+        <include>org.glassfish.jaxb:jaxb-runtime</include>
+        <include>org.glassfish.jaxb:jaxb-xjc</include>
 
         <include>org.yaml:snakeyaml</include>
       </includes>
diff --git a/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-ee8-container.xml b/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-ee8-container.xml
index bfd0f6366f..45701c4e0e 100644
--- a/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-ee8-container.xml
+++ b/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-ee8-container.xml
@@ -89,7 +89,8 @@
         
         <include>xerces:xercesImpl</include>
 
-        <include>com.sun.xml.bind:jaxb-xjc</include>
+        <include>org.glassfish.jaxb:jaxb-runtime</include>
+        <include>org.glassfish.jaxb:jaxb-xjc</include>
       </includes>
       <excludes>
         <exclude>org.jboss.resteasy:*</exclude>
diff --git a/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-servlet-container.xml b/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-servlet-container.xml
index b86eadce61..964fc1797f 100644
--- a/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-servlet-container.xml
+++ b/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-servlet-container.xml
@@ -84,6 +84,9 @@
         <include>org.dom4j:dom4j</include>
         <include>xerces:xercesImpl</include>
 
+        <include>org.glassfish.jaxb:jaxb-runtime</include>
+        <include>org.glassfish.jaxb:jaxb-xjc</include>
+
         <include>jakarta.jms:jakarta.jms-api</include>
 
         <include>org.quartz-scheduler:quartz</include>
diff --git a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/pom.xml b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/pom.xml
index 199184ee3b..3b5c0f9f8d 100644
--- a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/pom.xml
+++ b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/pom.xml
@@ -98,13 +98,13 @@
 
     <!--Java 11 test dependencies-->
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-core</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-xjc</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/kie-spring/pom.xml b/kie-spring/pom.xml
index 76efdd64a0..a2ee438365 100644
--- a/kie-spring/pom.xml
+++ b/kie-spring/pom.xml
@@ -134,13 +134,12 @@
     </dependency>
 
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
+      <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-xjc</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -315,11 +314,6 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/kie-takari-plugin/pom.xml b/kie-takari-plugin/pom.xml
index f79f8644c7..78d7be607c 100644
--- a/kie-takari-plugin/pom.xml
+++ b/kie-takari-plugin/pom.xml
@@ -172,16 +172,12 @@
           <artifactId>jakarta.activation-api</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-core</artifactId>
+          <groupId>org.glassfish.jaxb</groupId>
+          <artifactId>jaxb-runtime</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-impl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jakarta.xml.bind</groupId>
-          <artifactId>jakarta.xml.bind-api</artifactId>
+          <groupId>org.glassfish.jaxb</groupId>
+          <artifactId>jaxb-xjc</artifactId>
         </exclusion>
       </exclusions>
       <scope>runtime</scope>