From 53dd34c53b128fda503add7cebf524c70ae9069f Mon Sep 17 00:00:00 2001 From: mariofusco Date: Wed, 16 Mar 2022 11:01:53 +0100 Subject: [PATCH 1/3] wip --- kie-camel/pom.xml | 16 ++++------------ kie-maven-plugin/pom.xml | 12 ++++-------- kie-plugins-testing/pom.xml | 10 +++++----- kie-server-parent/kie-server-api/pom.xml | 8 ++++---- .../kie-server-remote/kie-server-client/pom.xml | 8 ++++---- .../kie-server-rest-case-mgmt/pom.xml | 4 ++-- .../kie-server-services-common/pom.xml | 4 ++-- .../kie-server-wars/kie-server/pom.xml | 2 +- .../jbpm-spring-boot-sample-basic/pom.xml | 8 ++++---- kie-spring/pom.xml | 12 +++--------- kie-takari-plugin/pom.xml | 12 ++++-------- 11 files changed, 37 insertions(+), 59 deletions(-) diff --git a/kie-camel/pom.xml b/kie-camel/pom.xml index 0a4ed2e8ce..ad4802f31e 100644 --- a/kie-camel/pom.xml +++ b/kie-camel/pom.xml @@ -44,13 +44,12 @@ - com.sun.xml.bind - jaxb-core + org.glassfish.jaxb + jaxb-runtime - - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-xjc @@ -137,13 +136,6 @@ - - com.sun.xml.bind - jaxb-xjc - runtime - true - - org.jbpm jbpm-flow 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 @@ jakarta.activation-api - com.sun.xml.bind - jaxb-core + org.glassfish.jaxb + jaxb-runtime - com.sun.xml.bind - jaxb-impl - - - jakarta.xml.bind - jakarta.xml.bind-api + org.glassfish.jaxb + jaxb-xjc runtime 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 @@ - com.sun.xml.bind - jaxb-core + org.glassfish.jaxb + jaxb-runtime - - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-xjc + org.kie kie-ci 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 @@ - com.sun.xml.bind - jaxb-core + org.glassfish.jaxb + jaxb-runtime test - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-xjc test 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 @@ - com.sun.xml.bind - jaxb-core + org.glassfish.jaxb + jaxb-runtime - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-xjc 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 @@ test - com.sun.xml.bind - jaxb-core + org.glassfish.jaxb + jaxb-runtime test 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 @@ - com.sun.xml.bind - jaxb-core + org.glassfish.jaxb + jaxb-runtime test 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 @@ - com.sun.xml.bind + org.glassfish.jaxb jaxb-xjc 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 @@ - com.sun.xml.bind - jaxb-core + org.glassfish.jaxb + jaxb-runtime test - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-xjc test 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 @@ - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime provided - - com.sun.xml.bind + org.glassfish.jaxb jaxb-xjc provided @@ -315,11 +314,6 @@ - - com.sun.xml.bind - jaxb-core - test - 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 @@ jakarta.activation-api - com.sun.xml.bind - jaxb-core + org.glassfish.jaxb + jaxb-runtime - com.sun.xml.bind - jaxb-impl - - - jakarta.xml.bind - jakarta.xml.bind-api + org.glassfish.jaxb + jaxb-xjc runtime From 8aeb7e3e88d0cff1b69ddc3bafdf1b0a9b760a9f Mon Sep 17 00:00:00 2001 From: Toshiya Kobayashi Date: Tue, 22 Mar 2022 17:08:01 +0900 Subject: [PATCH 2/3] - Exclude com.sun.xml.bind:jaxb-impl in test scope to avoid BanDuplicateClasses - Add glassfish jaxb-runtime and jaxb-xjc in kie-server war --- .../kie-server-tests/kie-server-integ-tests-dmn/pom.xml | 6 ++++++ .../kie-server/src/main/assembly/assembly-ee7-container.xml | 3 ++- .../kie-server/src/main/assembly/assembly-ee8-container.xml | 3 ++- .../src/main/assembly/assembly-servlet-container.xml | 3 +++ 4 files changed, 13 insertions(+), 2 deletions(-) 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 @@ io.rest-assured rest-assured test + + + com.sun.xml.bind + jaxb-impl + + 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 @@ xerces:xercesImpl - com.sun.xml.bind:jaxb-xjc + org.glassfish.jaxb:jaxb-runtime + org.glassfish.jaxb:jaxb-xjc org.yaml:snakeyaml 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 @@ xerces:xercesImpl - com.sun.xml.bind:jaxb-xjc + org.glassfish.jaxb:jaxb-runtime + org.glassfish.jaxb:jaxb-xjc org.jboss.resteasy:* 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 @@ org.dom4j:dom4j xerces:xercesImpl + org.glassfish.jaxb:jaxb-runtime + org.glassfish.jaxb:jaxb-xjc + jakarta.jms:jakarta.jms-api org.quartz-scheduler:quartz From e90406d33968bfa110a21271e8b5683b934bc5e7 Mon Sep 17 00:00:00 2001 From: Toshiya Kobayashi Date: Thu, 24 Mar 2022 16:46:35 +0900 Subject: [PATCH 3/3] - Exclude com.sun.xml.bind:jaxb-impl and jaxb-core to avoid BanDuplicateClasses --- .../camel-container-tests-module/pom.xml | 10 ++++++++++ kie-camel/pom.xml | 20 +++++++++++++++++++ 2 files changed, 30 insertions(+) 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 @@ org.apache.camel camel-core + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl + + provided diff --git a/kie-camel/pom.xml b/kie-camel/pom.xml index ad4802f31e..caa95590e9 100644 --- a/kie-camel/pom.xml +++ b/kie-camel/pom.xml @@ -94,6 +94,16 @@ org.apache.camel camel-core + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl + + org.apache.camel @@ -189,6 +199,16 @@ org.apache.camel camel-jaxb + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl + +