You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2018/11/12 10:40:17 UTC
[camel] 09/15: CAMEL-12618: replace com.sun.xml.bind with org....
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 29e1123f2a322cfbeefdc5327746eb64cb12e4b4
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Nov 9 11:19:58 2018 +0100
CAMEL-12618: replace com.sun.xml.bind with org....
...glassfish.jaxb
This replaces the `com.sun.xml.bind:jaxb-core` and
`com.sun.xml.bind:jaxb-impl` dependencies with
`org.glassfish.jaxb:jaxb-runtime`.
And `com.sun.xml.bind:jaxb-jxc` with `org.glassfish.jaxb:jaxb-jxc`.
---
camel-core/pom.xml | 12 ++----
components/camel-jaxb/pom.xml | 9 ++--
components/camel-soap/pom.xml | 5 ++-
components/camel-spring/pom.xml | 6 +++
components/camel-test/pom.xml | 12 ++----
connectors/examples/petstore-example/pom.xml | 12 ++----
examples/camel-example-pojo-messaging/pom.xml | 12 ++----
.../camel-example-spring-boot-rest-jpa/pom.xml | 12 ++----
parent/pom.xml | 48 ++++------------------
.../camel-spring-boot-dependencies/pom.xml | 28 +++----------
pom.xml | 16 +++-----
tooling/maven/camel-package-maven-plugin/pom.xml | 11 ++---
tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 11 ++---
tooling/swagger-rest-dsl-generator/pom.xml | 11 ++---
14 files changed, 56 insertions(+), 149 deletions(-)
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 840a51d..f9e78b2 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -150,15 +150,9 @@
<version>${jaxb-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
<optional>true</optional>
</dependency>
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 5a331e3..f115fc8 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -52,12 +52,9 @@
<version>${jaxb-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<!-- for testing -->
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index 9512ac6..585b06b 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -58,8 +58,9 @@
<version>${webservices-api-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<!-- test dependencies -->
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index a73a707..61bdb63 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -206,6 +206,12 @@
<version>${assertj-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml
index 5aac36b..3333263 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -52,15 +52,9 @@
<!-- in Java 11+ JAXB is no longer included -->
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
<optional>true</optional>
</dependency>
diff --git a/connectors/examples/petstore-example/pom.xml b/connectors/examples/petstore-example/pom.xml
index ee1afad..0d3d763 100644
--- a/connectors/examples/petstore-example/pom.xml
+++ b/connectors/examples/petstore-example/pom.xml
@@ -89,15 +89,9 @@
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
<scope>test</scope>
</dependency>
diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/camel-example-pojo-messaging/pom.xml
index 630644c..dd1a3ae 100644
--- a/examples/camel-example-pojo-messaging/pom.xml
+++ b/examples/camel-example-pojo-messaging/pom.xml
@@ -120,15 +120,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/examples/camel-example-spring-boot-rest-jpa/pom.xml b/examples/camel-example-spring-boot-rest-jpa/pom.xml
index 21b9701..f1ecefd 100644
--- a/examples/camel-example-spring-boot-rest-jpa/pom.xml
+++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml
@@ -125,15 +125,9 @@
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
<scope>test</scope>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index e9b478d..cb949dd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4032,26 +4032,11 @@
<version>${stax-api-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-jxc</artifactId>
- <version>${jaxb-version}</version>
+ <version>${jaxb-runtime-version}</version>
</dependency>
+
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
@@ -5008,14 +4993,14 @@
<version>${maven-antrun-plugin-version}</version>
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-jxc</artifactId>
- <version>${jaxb-version}</version>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
@@ -5660,23 +5645,6 @@
</build>
</profile>
- <profile>
- <id>jdk1.8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
<!-- experimental profile to activate ekstazi http://www.ekstazi.org -->
<profile>
<id>ekstazi</id>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 5844de1..c0a318b 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -121,27 +121,6 @@
<version>0.4.9</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.3.0</version>
- <exclusions>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-jxc</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
<version>1.4.5</version>
@@ -3452,6 +3431,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-jxc</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ <dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1.3</version>
@@ -3469,7 +3453,7 @@
<dependency>
<groupId>org.knowm.xchange</groupId>
<artifactId>xchange-core</artifactId>
- <version>4.3.11</version>
+ <version>4.3.12</version>
</dependency>
<dependency>
<groupId>org.mozilla</groupId>
diff --git a/pom.xml b/pom.xml
index 9eef4e8..58b59d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
<!-- eclipse plugin need the jaxb in this pom.xml file -->
<!-- Make sure to keep JAXB version up to date in parent/pom.xml in the bottom of the file -->
<jaxb-version>2.3.0</jaxb-version>
+ <jaxb-runtime-version>2.3.1</jaxb-runtime-version>
<errorprone-version>2.5</errorprone-version>
<mycila-license-version>3.0</mycila-license-version>
<gmavenplus-plugin-version>1.6.2</gmavenplus-plugin-version>
@@ -501,19 +502,14 @@
<artifactId>maven-antrun-plugin</artifactId>
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-jxc</artifactId>
- <version>${jaxb-version}</version>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index bbcbc6e..5dfe1c9 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -161,14 +161,9 @@
<version>${jaxb-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<!-- logging -->
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index c6b2fff..02de27c 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -115,14 +115,9 @@
<version>${annotation-api-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index 7d3565b..f6be8ba 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -58,14 +58,9 @@
<version>${jaxb-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime-version}</version>
</dependency>
<!-- test -->