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 b8267c89dcfb2fbb93feaa4508c0948a336f7f9f Author: Zoran Regvart <zregv...@apache.org> AuthorDate: Mon Jul 16 22:27:15 2018 +0200 CAMEL-12618: adjust dependencies for Java 11 support --- .../src/main/resources/archetype-resources/pom.xml | 17 +++++- camel-core/pom.xml | 2 +- components/camel-bam/pom.xml | 34 ++++++++++- components/camel-bindy/pom.xml | 17 +++++- components/camel-blueprint/pom.xml | 67 ++++++++++++++++++++-- components/camel-bonita/pom.xml | 17 +++++- components/camel-cdi/pom.xml | 29 +++++++++- components/camel-context/pom.xml | 17 +++++- components/camel-cxf-transport/pom.xml | 31 +++++++++- components/camel-hl7/pom.xml | 17 +++++- components/camel-jetty9/pom.xml | 22 ++++++- components/camel-mail/pom.xml | 17 +++++- components/camel-netty4/pom.xml | 47 +++++++++------ components/camel-ruby/pom.xml | 17 +++++- components/camel-spring-boot/pom.xml | 17 +++++- components/camel-spring-javaconfig/pom.xml | 17 +++++- components/camel-spring-ws/pom.xml | 26 +++++++-- components/camel-spring/pom.xml | 66 +++++++++++++++++---- components/camel-syslog/pom.xml | 17 +++++- components/camel-telegram/pom.xml | 17 +++++- components/camel-test-blueprint/pom.xml | 17 +++++- components/camel-test-spring/pom.xml | 17 +++++- components/camel-test/pom.xml | 17 +++++- components/camel-testcontainers-spring/pom.xml | 18 +++++- components/camel-testcontainers/pom.xml | 18 +++++- components/camel-testng/pom.xml | 17 +++++- components/camel-undertow/pom.xml | 16 ++++++ components/camel-wordpress/pom.xml | 17 +++++- connectors/examples/beverage-component/pom.xml | 17 +++++- connectors/examples/foo-bar-wine-example/pom.xml | 17 +++++- connectors/examples/petstore-example/pom.xml | 17 +++++- examples/camel-example-cafe/pom.xml | 17 +++++- examples/camel-example-cdi-metrics/pom.xml | 17 +++++- examples/camel-example-cdi-properties/pom.xml | 17 +++++- examples/camel-example-cdi-rest-servlet/pom.xml | 21 ++++++- examples/camel-example-cdi-test/pom.xml | 17 +++++- examples/camel-example-cxf-blueprint/pom.xml | 17 +++++- examples/camel-example-cxf-proxy/pom.xml | 17 +++++- examples/camel-example-cxf-tomcat/pom.xml | 15 ++++- examples/camel-example-loan-broker-cxf/pom.xml | 17 +++++- examples/camel-example-loan-broker-jms/pom.xml | 17 +++++- examples/camel-example-management/pom.xml | 17 +++++- examples/camel-example-pojo-messaging/pom.xml | 17 +++++- examples/camel-example-rabbitmq/pom.xml | 17 +++++- examples/camel-example-reportincident/pom.xml | 17 +++++- examples/camel-example-rest-producer/pom.xml | 17 +++++- .../camel-example-spring-boot-activemq/pom.xml | 17 +++++- .../pom.xml | 17 +++++- .../pom.xml | 17 +++++- examples/camel-example-spring-boot-master/pom.xml | 17 +++++- examples/camel-example-spring-boot-pojo/pom.xml | 17 +++++- .../camel-example-spring-boot-rest-jpa/pom.xml | 17 +++++- .../pom.xml | 17 +++++- examples/camel-example-spring-boot-xml/pom.xml | 17 +++++- examples/camel-example-spring-boot/pom.xml | 17 +++++- examples/camel-example-spring-jms/pom.xml | 17 +++++- examples/camel-example-transformer-demo/pom.xml | 17 +++++- .../camel-example-validator-spring-boot/pom.xml | 17 +++++- parent/pom.xml | 3 +- platforms/camel-catalog-rest/pom.xml | 4 +- platforms/spring-boot/components-starter/pom.xml | 17 +++++- tests/camel-blueprint-test/pom.xml | 17 +++++- .../pom.xml | 2 +- tooling/maven/camel-package-maven-plugin/pom.xml | 2 +- tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 2 +- 65 files changed, 1058 insertions(+), 149 deletions(-) diff --git a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml index c439407..b584ec6 100644 --- a/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml @@ -152,9 +152,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -167,5 +167,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/camel-core/pom.xml b/camel-core/pom.xml index f2b6646..3deb094 100644 --- a/camel-core/pom.xml +++ b/camel-core/pom.xml @@ -662,7 +662,7 @@ <profile> <id>jdk9-10-build</id> <activation> - <jdk>[9,10)</jdk> + <jdk>[9,10]</jdk> </activation> <dependencies> diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml index 790bc26..450f3ce 100644 --- a/components/camel-bam/pom.xml +++ b/components/camel-bam/pom.xml @@ -210,9 +210,9 @@ </profile> <profile> - <id>jdk9+-hibernate</id> + <id>jdk9-10-hibernate</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <testResources> @@ -243,5 +243,35 @@ </dependency> </dependencies> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <build> + <testResources> + <testResource> + <directory>${basedir}/src/test/profiles/hibernate</directory> + </testResource> + </testResources> + </build> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml index 413f63e..b19ce8e 100644 --- a/components/camel-bindy/pom.xml +++ b/components/camel-bindy/pom.xml @@ -105,9 +105,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -121,5 +121,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml index 86711ce..a62d8c3 100644 --- a/components/camel-blueprint/pom.xml +++ b/components/camel-blueprint/pom.xml @@ -412,10 +412,10 @@ </execution> </executions> </plugin> - <plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId> - <version>2.3.1</version> + <version>2.4</version> <executions> <execution> <id>generate-schema</id> @@ -489,9 +489,9 @@ </build> </profile> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> <property> <name>!os.unsupported.schemagen</name> </property> @@ -502,7 +502,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId> - <version>2.3.1</version> + <version>2.4</version> <dependencies> <dependency> <groupId>org.glassfish.jaxb</groupId> @@ -553,6 +553,63 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> + <version>2.4</version> + <dependencies> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + <version>1.2.0</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.8</version> + <executions> + <execution> + <id>include-sources</id> + <phase>package</phase> + <configuration> + <target> + <echo>Including source code from camel-core-xml in the camel-blueprint-sources.jar</echo> + <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar" + update="true"> + <fileset dir="${basedir}/../camel-core-osgi/src/main/java" includes="**/*"/> + <fileset dir="${basedir}/../camel-core-xml/src/main/java" includes="**/*"/> + </jar> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> <reporting> diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml index 585565f..eb5efd5 100644 --- a/components/camel-bonita/pom.xml +++ b/components/camel-bonita/pom.xml @@ -92,9 +92,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -107,5 +107,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml index 3597f0a..ae440dd 100644 --- a/components/camel-cdi/pom.xml +++ b/components/camel-cdi/pom.xml @@ -501,13 +501,20 @@ </dependencies> + </profile> + + <profile> + <id>jdk9-10--build</id> + <activation> + <jdk>[9,10]</jdk> + </activation> <build> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <reuseForks>true</reuseForks> - <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar --patch-module java.xml.bind=${project.basedir}/target/java9 ${camel.surefire.fork.vmargs} --add-opens java.base/java.lang=java.xml.bind</argLine> + <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${annotation-api-version}.jar --patch-module java.xml.bind=${project.basedir}/target/java9 ${camel.surefire.fork.vmargs} --add-opens java.base/java.lang=java.xml.bind</argLine> </configuration> </plugin> <plugin> @@ -526,7 +533,7 @@ <artifactItem> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>1.2</version> + <version>${annotation-api-version}</version> <type>jar</type> <overWrite>false</overWrite> <outputDirectory>${project.basedir}/target/java9</outputDirectory> @@ -568,6 +575,24 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>${annotation-api-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-context/pom.xml b/components/camel-context/pom.xml index 9148299..2b96631 100644 --- a/components/camel-context/pom.xml +++ b/components/camel-context/pom.xml @@ -86,9 +86,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -101,5 +101,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml index 02e1480..6936254 100644 --- a/components/camel-cxf-transport/pom.xml +++ b/components/camel-cxf-transport/pom.xml @@ -203,15 +203,22 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>6.2</version> + </dependency> + </dependencies> </plugin> </plugins> </build> <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -225,6 +232,26 @@ </plugins> </build> </profile> + + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>${annotation-api-version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>webservices-api</artifactId> + <version>2.1-b16</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml index 6982cd3..6b3b108 100644 --- a/components/camel-hl7/pom.xml +++ b/components/camel-hl7/pom.xml @@ -149,9 +149,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -164,5 +164,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml index 101bed7..ddac318 100644 --- a/components/camel-jetty9/pom.xml +++ b/components/camel-jetty9/pom.xml @@ -190,9 +190,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -205,6 +205,24 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>${annotation-api-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index 4c9cc48..ce64948 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -142,9 +142,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -158,5 +158,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml index dca3ecf..6fe12c1 100644 --- a/components/camel-netty4/pom.xml +++ b/components/camel-netty4/pom.xml @@ -84,23 +84,36 @@ </dependencies> <profiles> - <profile> - <id>jdk9+-build</id> - <activation> - <jdk>[9,)</jdk> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds> - <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED</argLine> - </configuration> - </plugin> - </plugins> - </build> - </profile> + <profile> + <id>jdk9-10-build</id> + <activation> + <jdk>[9,10]</jdk> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds> + <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED</argLine> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-ruby/pom.xml b/components/camel-ruby/pom.xml index c3cd5a4..f7e680f 100644 --- a/components/camel-ruby/pom.xml +++ b/components/camel-ruby/pom.xml @@ -80,9 +80,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -95,5 +95,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml index 345ae1a..4f0227f 100644 --- a/components/camel-spring-boot/pom.xml +++ b/components/camel-spring-boot/pom.xml @@ -128,9 +128,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -144,5 +144,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml index c8a40d6..7f0e46a 100644 --- a/components/camel-spring-javaconfig/pom.xml +++ b/components/camel-spring-javaconfig/pom.xml @@ -96,9 +96,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -112,5 +112,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml index bb7cea9..e1d2927 100644 --- a/components/camel-spring-ws/pom.xml +++ b/components/camel-spring-ws/pom.xml @@ -188,16 +188,16 @@ <profiles> <profile> - <id>java9+</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>--patch-module java.xml.bind=${project.basedir}/target/java9/stax-ex-1.7.8.jar --patch-module java.xml.ws=${project.basedir}/target/java9/saaj-impl-1.3.28.jar --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar ${camel.surefire.fork.vmargs} --add-exports=java.xml/com.sun.org.apache.xerces.internal.dom=java.xml.ws --add-exports=java.xml.bind/org.jvnet.staxex.util=java.xml.ws</argLine> + <argLine>--patch-module java.xml.bind=${project.basedir}/target/java9/stax-ex-1.7.8.jar --patch-module java.xml.ws=${project.basedir}/target/java9/saaj-impl-1.3.28.jar --patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${annotation-api-version}.jar ${camel.surefire.fork.vmargs} --add-exports=java.xml/com.sun.org.apache.xerces.internal.dom=java.xml.ws --add-exports=java.xml.bind/org.jvnet.staxex.util=java.xml.ws</argLine> </configuration> </plugin> <plugin> @@ -224,7 +224,7 @@ <artifactItem> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>1.2</version> + <version>${annotation-api-version}</version> <type>jar</type> <overWrite>false</overWrite> <outputDirectory>${project.basedir}/target/java9</outputDirectory> @@ -247,5 +247,23 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>${annotation-api-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml index 72f88e0..e9e1134 100644 --- a/components/camel-spring/pom.xml +++ b/components/camel-spring/pom.xml @@ -575,7 +575,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId> - <version>2.3.1</version> + <version>2.4</version> <executions> <execution> <id>generate schema</id> @@ -598,9 +598,9 @@ </profile> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <dependencies> <!-- xmltokenizer using woodstox --> @@ -614,15 +614,9 @@ <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> + <version>2.4</version> <dependencies> <dependency> <groupId>org.glassfish.jaxb</groupId> @@ -652,6 +646,58 @@ <createJavaDocAnnotations>false</createJavaDocAnnotations> </configuration> </plugin> + <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> + </plugins> + </build> + </profile> + + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <id>generate schema</id> + <phase>generate-test-sources</phase> + <goals> + <goal>schemagen</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/schema</outputDirectory> + <sources> + <source>${project.build.directory}/schema-src</source> + </sources> + <createJavaDocAnnotations>false</createJavaDocAnnotations> + </configuration> + <dependencies> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + <version>1.2.0</version> + </dependency> + </dependencies> + </plugin> </plugins> </build> </profile> diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml index d032fc2..60308de 100644 --- a/components/camel-syslog/pom.xml +++ b/components/camel-syslog/pom.xml @@ -87,9 +87,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -102,5 +102,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml index c5f740e..97544a2 100644 --- a/components/camel-telegram/pom.xml +++ b/components/camel-telegram/pom.xml @@ -141,9 +141,9 @@ </build> </profile> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -156,6 +156,19 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml index 175073b..931f953 100644 --- a/components/camel-test-blueprint/pom.xml +++ b/components/camel-test-blueprint/pom.xml @@ -178,9 +178,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -193,5 +193,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml index a406a50..0a6be29 100644 --- a/components/camel-test-spring/pom.xml +++ b/components/camel-test-spring/pom.xml @@ -76,9 +76,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -92,5 +92,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml index 545d167..63ca268 100644 --- a/components/camel-test/pom.xml +++ b/components/camel-test/pom.xml @@ -72,9 +72,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -87,5 +87,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-testcontainers-spring/pom.xml b/components/camel-testcontainers-spring/pom.xml index 9be4a41..8f4908d 100644 --- a/components/camel-testcontainers-spring/pom.xml +++ b/components/camel-testcontainers-spring/pom.xml @@ -75,9 +75,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -91,6 +91,20 @@ </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> + <!-- activate integration test if the docker socket file is accessible --> <profile> <id>testcontainers-spring-integration-tests-docker-file</id> diff --git a/components/camel-testcontainers/pom.xml b/components/camel-testcontainers/pom.xml index 4f95cbd..4a07ea6 100644 --- a/components/camel-testcontainers/pom.xml +++ b/components/camel-testcontainers/pom.xml @@ -77,9 +77,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -93,6 +93,20 @@ </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> + <!-- activate integration test if the docker socket file is accessible --> <profile> <id>testcontainers-integration-tests-docker-file</id> diff --git a/components/camel-testng/pom.xml b/components/camel-testng/pom.xml index 1ad175d..3bced62 100644 --- a/components/camel-testng/pom.xml +++ b/components/camel-testng/pom.xml @@ -84,9 +84,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -100,5 +100,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml index 7dc8d48..68576eb 100644 --- a/components/camel-undertow/pom.xml +++ b/components/camel-undertow/pom.xml @@ -115,4 +115,20 @@ </dependency> </dependencies> + <profiles> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>${annotation-api-version}</version> + </dependency> + </dependencies> + </profile> + </profiles> + </project> diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml index 41b560b..d80c62a 100644 --- a/components/camel-wordpress/pom.xml +++ b/components/camel-wordpress/pom.xml @@ -127,9 +127,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -142,6 +142,19 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/connectors/examples/beverage-component/pom.xml b/connectors/examples/beverage-component/pom.xml index 48d41e2..89d3329 100644 --- a/connectors/examples/beverage-component/pom.xml +++ b/connectors/examples/beverage-component/pom.xml @@ -95,9 +95,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -110,5 +110,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/connectors/examples/foo-bar-wine-example/pom.xml b/connectors/examples/foo-bar-wine-example/pom.xml index 270dd0e..39466c8 100644 --- a/connectors/examples/foo-bar-wine-example/pom.xml +++ b/connectors/examples/foo-bar-wine-example/pom.xml @@ -107,9 +107,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -122,5 +122,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/connectors/examples/petstore-example/pom.xml b/connectors/examples/petstore-example/pom.xml index cb495e9..9a050ca 100644 --- a/connectors/examples/petstore-example/pom.xml +++ b/connectors/examples/petstore-example/pom.xml @@ -110,9 +110,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -125,5 +125,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-cafe/pom.xml b/examples/camel-example-cafe/pom.xml index 969c662..818fdbf 100644 --- a/examples/camel-example-cafe/pom.xml +++ b/examples/camel-example-cafe/pom.xml @@ -123,9 +123,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -138,5 +138,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml index 6b116e8..656cc9c 100644 --- a/examples/camel-example-cdi-metrics/pom.xml +++ b/examples/camel-example-cdi-metrics/pom.xml @@ -131,9 +131,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -146,5 +146,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml index 9715d4b..c529cf2 100644 --- a/examples/camel-example-cdi-properties/pom.xml +++ b/examples/camel-example-cdi-properties/pom.xml @@ -128,9 +128,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -143,5 +143,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml index 1647a30..e395277 100644 --- a/examples/camel-example-cdi-rest-servlet/pom.xml +++ b/examples/camel-example-cdi-rest-servlet/pom.xml @@ -172,7 +172,7 @@ </dependencies> </profile> <profile> - <id>jdk9+-build-jetty</id> + <id>jdk9+-jetty</id> <activation> <jdk>[9,)</jdk> </activation> @@ -202,6 +202,12 @@ </exclusions> </dependency> </dependencies> + </profile> + <profile> + <id>jdk9-10-build</id> + <activation> + <jdk>[9,10]</jdk> + </activation> <build> <plugins> <plugin> @@ -213,6 +219,19 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> <build> diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml index 8732426..7e14ece 100644 --- a/examples/camel-example-cdi-test/pom.xml +++ b/examples/camel-example-cdi-test/pom.xml @@ -112,9 +112,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -127,5 +127,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-cxf-blueprint/pom.xml b/examples/camel-example-cxf-blueprint/pom.xml index 32652cb..22c98a1 100644 --- a/examples/camel-example-cxf-blueprint/pom.xml +++ b/examples/camel-example-cxf-blueprint/pom.xml @@ -102,9 +102,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -117,5 +117,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-cxf-proxy/pom.xml b/examples/camel-example-cxf-proxy/pom.xml index 49dfa31..d7e58bf 100644 --- a/examples/camel-example-cxf-proxy/pom.xml +++ b/examples/camel-example-cxf-proxy/pom.xml @@ -154,9 +154,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -169,5 +169,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-cxf-tomcat/pom.xml b/examples/camel-example-cxf-tomcat/pom.xml index fd50281..7af41ff 100644 --- a/examples/camel-example-cxf-tomcat/pom.xml +++ b/examples/camel-example-cxf-tomcat/pom.xml @@ -138,7 +138,7 @@ </properties> </profile> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> <jdk>[9,)</jdk> </activation> @@ -153,6 +153,19 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-loan-broker-cxf/pom.xml b/examples/camel-example-loan-broker-cxf/pom.xml index 3be3754..789a221 100644 --- a/examples/camel-example-loan-broker-cxf/pom.xml +++ b/examples/camel-example-loan-broker-cxf/pom.xml @@ -172,9 +172,9 @@ </properties> </profile> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -187,6 +187,19 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-loan-broker-jms/pom.xml b/examples/camel-example-loan-broker-jms/pom.xml index 38ff034..a93fc08 100644 --- a/examples/camel-example-loan-broker-jms/pom.xml +++ b/examples/camel-example-loan-broker-jms/pom.xml @@ -180,9 +180,9 @@ </properties> </profile> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -195,6 +195,19 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-management/pom.xml b/examples/camel-example-management/pom.xml index f60ff98..12d56ca 100644 --- a/examples/camel-example-management/pom.xml +++ b/examples/camel-example-management/pom.xml @@ -140,9 +140,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -155,5 +155,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/camel-example-pojo-messaging/pom.xml index d4a4d99..986a083 100644 --- a/examples/camel-example-pojo-messaging/pom.xml +++ b/examples/camel-example-pojo-messaging/pom.xml @@ -158,9 +158,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -173,5 +173,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-rabbitmq/pom.xml b/examples/camel-example-rabbitmq/pom.xml index 00c88dc..0f83223 100644 --- a/examples/camel-example-rabbitmq/pom.xml +++ b/examples/camel-example-rabbitmq/pom.xml @@ -138,9 +138,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -153,5 +153,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml index 0cffa44..a164b1c 100644 --- a/examples/camel-example-reportincident/pom.xml +++ b/examples/camel-example-reportincident/pom.xml @@ -198,9 +198,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -213,5 +213,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-rest-producer/pom.xml b/examples/camel-example-rest-producer/pom.xml index d3a88e7..4f1edf1 100644 --- a/examples/camel-example-rest-producer/pom.xml +++ b/examples/camel-example-rest-producer/pom.xml @@ -134,9 +134,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -149,5 +149,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-spring-boot-activemq/pom.xml b/examples/camel-example-spring-boot-activemq/pom.xml index 6ab6da6..9ddc478 100644 --- a/examples/camel-example-spring-boot-activemq/pom.xml +++ b/examples/camel-example-spring-boot-activemq/pom.xml @@ -127,9 +127,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -143,6 +143,19 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-spring-boot-clustered-route-controller/pom.xml b/examples/camel-example-spring-boot-clustered-route-controller/pom.xml index fac7c9c..54d9fe9 100644 --- a/examples/camel-example-spring-boot-clustered-route-controller/pom.xml +++ b/examples/camel-example-spring-boot-clustered-route-controller/pom.xml @@ -48,9 +48,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -63,5 +63,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-spring-boot-health-checks/pom.xml b/examples/camel-example-spring-boot-health-checks/pom.xml index ecbb3bb..55e68c9 100644 --- a/examples/camel-example-spring-boot-health-checks/pom.xml +++ b/examples/camel-example-spring-boot-health-checks/pom.xml @@ -49,9 +49,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -64,5 +64,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-spring-boot-master/pom.xml b/examples/camel-example-spring-boot-master/pom.xml index 034e6f9..7e6b8f5 100644 --- a/examples/camel-example-spring-boot-master/pom.xml +++ b/examples/camel-example-spring-boot-master/pom.xml @@ -114,9 +114,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -129,5 +129,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-spring-boot-pojo/pom.xml b/examples/camel-example-spring-boot-pojo/pom.xml index 7920fe0..2785969 100644 --- a/examples/camel-example-spring-boot-pojo/pom.xml +++ b/examples/camel-example-spring-boot-pojo/pom.xml @@ -112,9 +112,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -127,5 +127,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-spring-boot-rest-jpa/pom.xml b/examples/camel-example-spring-boot-rest-jpa/pom.xml index a79b32d..5c94611 100644 --- a/examples/camel-example-spring-boot-rest-jpa/pom.xml +++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml @@ -145,9 +145,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -160,6 +160,19 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml index 6210564..42a9c0f 100644 --- a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml +++ b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml @@ -141,9 +141,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -156,5 +156,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-spring-boot-xml/pom.xml b/examples/camel-example-spring-boot-xml/pom.xml index 29e6a0a..1055a66 100644 --- a/examples/camel-example-spring-boot-xml/pom.xml +++ b/examples/camel-example-spring-boot-xml/pom.xml @@ -139,9 +139,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -154,5 +154,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-spring-boot/pom.xml b/examples/camel-example-spring-boot/pom.xml index 64808c4..4c3e662 100644 --- a/examples/camel-example-spring-boot/pom.xml +++ b/examples/camel-example-spring-boot/pom.xml @@ -138,9 +138,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -153,5 +153,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml index 64fd1e4..2c9f819 100644 --- a/examples/camel-example-spring-jms/pom.xml +++ b/examples/camel-example-spring-jms/pom.xml @@ -145,9 +145,9 @@ </properties> </profile> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -160,6 +160,19 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> <build> diff --git a/examples/camel-example-transformer-demo/pom.xml b/examples/camel-example-transformer-demo/pom.xml index a85874b..37a9939 100644 --- a/examples/camel-example-transformer-demo/pom.xml +++ b/examples/camel-example-transformer-demo/pom.xml @@ -106,9 +106,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -121,5 +121,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/examples/camel-example-validator-spring-boot/pom.xml b/examples/camel-example-validator-spring-boot/pom.xml index 417f2b4..b3bde27 100644 --- a/examples/camel-example-validator-spring-boot/pom.xml +++ b/examples/camel-example-validator-spring-boot/pom.xml @@ -127,9 +127,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -142,5 +142,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/parent/pom.xml b/parent/pom.xml index 59d8187..241f37f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -45,6 +45,7 @@ <activemq-version>5.15.4</activemq-version> <aether-version>1.0.2.v20150114</aether-version> <ahc-version>2.5.2</ahc-version> + <annotation-api-version>1.3.2</annotation-api-version> <ant-bundle-version>1.7.0_6</ant-bundle-version> <antlr-bundle-version>3.5.2_1</antlr-bundle-version> <antlr-runtime-bundle-version>3.5.2_1</antlr-runtime-bundle-version> @@ -171,7 +172,7 @@ <couchbase-client-version>1.4.13</couchbase-client-version> <couchbase-client-bundle-version>1.4.13_1</couchbase-client-bundle-version> <curator-version>2.12.0</curator-version> - <cxf-version>3.2.5</cxf-version> + <cxf-version>3.3.0-SNAPSHOT</cxf-version><!-- we need SNAPSHOT version for Java 11 support, see CXF-7741 --> <cxf-version-range>[3.1,4.0)</cxf-version-range> <cxf-xjc-plugin-version>3.2.0</cxf-xjc-plugin-version> <cxf-xjc-utils-version>3.2.0</cxf-xjc-utils-version> diff --git a/platforms/camel-catalog-rest/pom.xml b/platforms/camel-catalog-rest/pom.xml index f9c4c3b..332ce41 100644 --- a/platforms/camel-catalog-rest/pom.xml +++ b/platforms/camel-catalog-rest/pom.xml @@ -184,7 +184,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar ${camel.surefire.fork.vmargs}</argLine> + <argLine>--patch-module java.xml.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-${annotation-api-version}.jar ${camel.surefire.fork.vmargs}</argLine> </configuration> </plugin> <plugin> @@ -203,7 +203,7 @@ <artifactItem> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>1.2</version> + <version>${annotation-api-version}</version> <type>jar</type> <overWrite>false</overWrite> <outputDirectory>${project.basedir}/target/java9</outputDirectory> diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml index 5b0ee13..1f0f417 100644 --- a/platforms/spring-boot/components-starter/pom.xml +++ b/platforms/spring-boot/components-starter/pom.xml @@ -350,9 +350,9 @@ </modules> <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -365,5 +365,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/tests/camel-blueprint-test/pom.xml b/tests/camel-blueprint-test/pom.xml index af08026..939129b 100644 --- a/tests/camel-blueprint-test/pom.xml +++ b/tests/camel-blueprint-test/pom.xml @@ -64,9 +64,9 @@ <profiles> <profile> - <id>jdk9+-build</id> + <id>jdk9-10-build</id> <activation> - <jdk>[9,)</jdk> + <jdk>[9,10]</jdk> </activation> <build> <plugins> @@ -79,5 +79,18 @@ </plugins> </build> </profile> + <profile> + <id>jdk11+-build</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-version}</version> + </dependency> + </dependencies> + </profile> </profiles> </project> diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml index c3546ca..9837ab6 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml @@ -150,7 +150,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.3</version> + <version>3.6-SNAPSHOT</version> <configuration> <!-- see http://jira.codehaus.org/browse/MNG-5346 --> <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index 47cf92a..1456554 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -196,7 +196,7 @@ <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>1.3</version> + <version>${annotation-api-version}</version> </dependency> </dependencies> </profile> diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml index 9c7e449..aa0d93c 100644 --- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml +++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml @@ -114,7 +114,7 @@ <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>1.3</version> + <version>${annotation-api-version}</version> </dependency> </dependencies> </profile>