This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 1d342f5 Build on JDK-11, upgrade jaxb2-maven-plugin, use jakarta-jaxb
1d342f5 is described below
commit 1d342f5672acf202b43af0db769e4c25d40d6e38
Author: jpoth <poth.j...@gmail.com>
AuthorDate: Thu Feb 7 17:14:43 2019 +0100
Build on JDK-11, upgrade jaxb2-maven-plugin, use jakarta-jaxb
---
components/camel-blueprint/pom.xml | 21 ----
components/camel-cdi/pom.xml | 12 +--
components/camel-spring/pom.xml | 20 ----
core/camel-api/pom.xml | 12 +--
core/camel-core/pom.xml | 13 ++-
core/camel-management-api/pom.xml | 12 +--
core/camel-management-impl/pom.xml | 12 +--
core/camel-util/pom.xml | 12 +--
parent/pom.xml | 112 +++++++++++++--------
tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 21 +++-
10 files changed, 124 insertions(+), 123 deletions(-)
diff --git a/components/camel-blueprint/pom.xml
b/components/camel-blueprint/pom.xml
index 7527d6a..4d1dc71 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -431,27 +431,6 @@
</property>
</activation>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.4</version>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-jxc-jdk9</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 55c2d22..51c1660 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -562,16 +562,16 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-jaxb-version}</version>
<overWrite>false</overWrite>
<outputDirectory>${project.basedir}/target/java9</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${glassfish-jaxb-runtime-version}</version>
<overWrite>false</overWrite>
<outputDirectory>${project.basedir}/target/java9</outputDirectory>
</artifactItem>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 04c97e4..2b5c429 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -521,7 +521,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
<executions>
<execution>
<id>generate schema</id>
@@ -560,27 +559,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens
java.base/java.lang=ALL-UNNAMED
--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED
--add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED
--add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED
--add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-jxc-jdk9</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>generate schema</id>
diff --git a/core/camel-api/pom.xml b/core/camel-api/pom.xml
index abbbc1c..65b571c 100644
--- a/core/camel-api/pom.xml
+++ b/core/camel-api/pom.xml
@@ -311,14 +311,14 @@
</configuration>
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-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>${glassfish-jaxb-runtime-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index bf95f24..e6be921 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -752,18 +752,17 @@
<FOO_SERVICE_HOST>myserver</FOO_SERVICE_HOST>
<FOO_SERVICE_PORT>8081</FOO_SERVICE_PORT>
</environmentVariables>
- <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens
java.base/java.lang=ALL-UNNAMED --add-opens
java.base/java.lang.reflect=ALL-UNNAMED</argLine>
</configuration>
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-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>${glassfish-jaxb-runtime-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/core/camel-management-api/pom.xml
b/core/camel-management-api/pom.xml
index 599e01b..155b80a 100644
--- a/core/camel-management-api/pom.xml
+++ b/core/camel-management-api/pom.xml
@@ -311,14 +311,14 @@
</configuration>
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-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>${glassfish-jaxb-runtime-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/core/camel-management-impl/pom.xml
b/core/camel-management-impl/pom.xml
index 65ffe90..a230ca9 100644
--- a/core/camel-management-impl/pom.xml
+++ b/core/camel-management-impl/pom.xml
@@ -380,14 +380,14 @@
</configuration>
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-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>${glassfish-jaxb-runtime-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/core/camel-util/pom.xml b/core/camel-util/pom.xml
index 481608f..5e82a53 100644
--- a/core/camel-util/pom.xml
+++ b/core/camel-util/pom.xml
@@ -326,14 +326,14 @@
</configuration>
<dependencies>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-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>${glassfish-jaxb-runtime-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index 10449d4..9ebe2d0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -346,6 +346,10 @@
<javax.servlet-api-version>3.1.0</javax.servlet-api-version>
<javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
<jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
+ <jakarta-jaxb-version>2.3.2</jakarta-jaxb-version>
+
<glassfish-jaxb-runtime-version>${jakarta-jaxb-version}</glassfish-jaxb-runtime-version>
+
<glassfish-jaxb-xjc-version>${jakarta-jaxb-version}</glassfish-jaxb-xjc-version>
+ <jaxb2-maven-plugin-version>2.4</jaxb2-maven-plugin-version>
<jaxen-version>1.1.6</jaxen-version>
<jbpm-version>7.14.0.Final</jbpm-version>
<jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
@@ -4877,6 +4881,11 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <version>${jaxb2-maven-plugin-version}</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>${maven-plugin-plugin-version}</version>
@@ -5750,56 +5759,32 @@
<jdk>[9,)</jdk>
</activation>
<properties>
- <cxf.codegen.jvmArgs>--add-modules
java.activation,java.xml.bind,java.xml.ws
-
--add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED
- --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED
-
--add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED
-
--add-exports=java.xml.bind/com.sun.xml.internal.bind.marshaller=ALL-UNNAMED
--add-opens
- java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens
java.base/java.security=ALL-UNNAMED --add-opens
- java.base/java.net=ALL-UNNAMED --add-opens
java.base/java.lang=ALL-UNNAMED --add-opens
- java.base/java.util=ALL-UNNAMED --add-opens
java.base/java.util.concurrent=ALL-UNNAMED
- </cxf.codegen.jvmArgs>
- <cxf.xjc.jvmArgs>--add-modules
java.activation,java.xml.bind,java.xml.ws
-
--add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED
- --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED
-
--add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED
-
--add-exports=java.xml.bind/com.sun.xml.internal.bind.marshaller=ALL-UNNAMED
--add-opens
- java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens
java.base/java.security=ALL-UNNAMED --add-opens
- java.base/java.net=ALL-UNNAMED --add-opens
java.base/java.lang=ALL-UNNAMED --add-opens
- java.base/java.util=ALL-UNNAMED --add-opens
java.base/java.util.concurrent=ALL-UNNAMED
- </cxf.xjc.jvmArgs>
<cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
- <camel.surefire.fork.vmargs>--add-modules
java.xml.bind,java.xml.ws,java.xml.ws.annotation,java.sql --add-opens
- java.base/javax.net=ALL-UNNAMED --add-opens
java.base/sun.nio.ch=ALL-UNNAMED --add-opens
- java.base/java.net=ALL-UNNAMED --add-opens
java.base/java.util.concurrent=ALL-UNNAMED --add-opens
- java.base/java.util.regex=ALL-UNNAMED --add-opens
java.desktop/java.awt.font=ALL-UNNAMED --add-opens
- java.base/java.lang.reflect=ALL-UNNAMED --add-opens
java.base/java.text=ALL-UNNAMED --add-opens
- java.base/java.util=ALL-UNNAMED --add-opens
java.base/java.lang=ALL-UNNAMED --add-opens
- java.base/java.nio=ALL-UNNAMED --add-opens
java.base/java.io=ALL-UNNAMED
- --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED
- --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED
-
--add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED
-
--add-exports=java.xml/com.sun.org.apache.xml.internal.serialize=ALL-UNNAMED
- --add-exports=java.base/sun.net.util=ALL-UNNAMED
--add-exports=java.base/sun.net.spi=ALL-UNNAMED
- </camel.surefire.fork.vmargs>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb-version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-jaxb-version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-package-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-jaxb-version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -5810,12 +5795,8 @@
<target>${jdk.version}</target>
<maxmem>512M</maxmem>
<fork>true</fork>
- <compilerArgs>
- <arg>-J--add-modules</arg>
- <arg>-Jjava.xml.bind</arg>
- <!-- SB2 actuator endpoint requires MethodParameter metadata
-->
- <arg>-parameters</arg>
- </compilerArgs>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
</configuration>
</plugin>
<plugin>
@@ -5828,6 +5809,53 @@
</plugins>
</pluginManagement>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.3.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>1.4.0-b03</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ <version>1.0.6.Final</version>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
</project>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index 5084c66..6c36e05 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -108,6 +108,16 @@
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-servlet</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jetty9</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -125,9 +135,14 @@
</activation>
<dependencies>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${glassfish-jaxb-runtime-version}</version>
</dependency>
</dependencies>
</profile>
