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/08/22 05:54:56 UTC
[camel] branch java-10-test updated (231910bc -> 4cbcdc1)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git.
discard 231910bc CAMEL-12618: Additional dependencies needed on ...
discard d2278b0 CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
discard 3386d01 CAMEL-12618: Use fork of maven-plugin-plugin th...
discard 89ecfa0 CAMEL-12618: Use fork of MVEL that supports Jav...
discard e576088 Temporary disable JDK 9 and karaf-itest builds
add 6f449df CAMEL-12597: camel-servlet now allows to specify accepted filename ext via a new whitelist option.
add 73b7e23 Upgrade Drill to version 1.14.0
add 6601c5c Upgrade Flink to version 1.6.0
add faa082a Added Camel-Drill Spring-boot integration test
add 49024bd Upgrade Hibernate Bean Validator to version 6.0.12.Final
add 0080aeb Upgrade OkHttp Client and related bundle to version 3.11.0
add dccf438 Upgrade Okio and related bundle to version 1.15.0
add 7636739 Upgrade Atmosphere Websocket to version 2.4.30
add 2d06c75 Upgrade Maven Owasp plugin to version 3.3.1
add 307632b Update micrometer-component.adoc (#2486)
add cb85e25 [CAMEL-12706] added documentation for new options. (#2485)
add e9e5437 CAMEL-12706: camel-as2 added missing options into component docs. Polished a bit. We only need to document the setter method, and make it use just plain text so the spring boot docs are also nice - do not use too much html tags.
add 54a6985 CAMEL-12740: HttpAsyncClientBuilder is now used when no ClientBuilder is specified (#2487)
add f68af36 CAMEL-12736 Create FHIR authorization and transaction quickstart (#2484)
add ff138c9 Polished examples a bit with a new health care category.
add 568925e Regen
add 6b692cb Regen and updated component docs
add 5c554fc Regen and updated component docs
add ee42401 [CAMEL-12605] First cut at mime envelope entity (#2489)
add 4c3785e Fixed CS
add a533dcc Fixed test in camel-web3j as the hash operation is using numbers as input.
add 0aaa636 Update (c) year
add 85fe5a9 Upgrade Qpid-jms client to version 0.36.0
add e4a0e32 Upgrade Proton-j to version 0.29.0
add 8c2fd46 Fixed camel-web3j Karaf feature after Quorum dependency has been added
add 495c1ad Use the Web3j Quorum version declared in Parent POM for Karaf feature
add dc95c9c Upgrade Rest Assured to version 3.1.1
add 6b63347 Added a note to camel-ignite Karaf feature details
add 4fa2b43 Upgrade Json schema validator to version 0.1.21
add d32b269 Upgrade Commons-compress to version 1.18
add e9a0ac3 CAMEL-12745: NullPointerException in APT IOHelper
add 6a35c60 CAMEL-12744: use SSL configuration in Restlet c...
add 015761d Remove unused import
add 33ed7c8 Upgrade Kubernetes-model to version 3.0.2
add 259cbe7 Upgrade Kubernetes client to version 4.0.4
add ec5f5a9 Camel-Kubernetes: Align component to the new kubernetes-model
new 684633e Temporary disable JDK 9 and karaf-itest builds
new e0b68e4 CAMEL-12618: Use fork of MVEL that supports Jav...
new 3de4223 CAMEL-12618: Use fork of maven-plugin-plugin th...
new 6243155 CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
new 4cbcdc1 CAMEL-12618: Additional dependencies needed on ...
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (231910bc)
\
N -- N -- N refs/heads/java-10-test (4cbcdc1)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...natureEntity.java => ApplicationPkcs7Mime.java} | 91 +++++------
.../entity/ApplicationPkcs7SignatureEntity.java | 7 +-
.../component/as2/api/entity/EntityParser.java | 2 +-
.../src/main/docs/as2-component.adoc | 74 ++++++---
.../apache/camel/component/as2/AS2Component.java | 6 +-
.../camel/component/as2/AS2Configuration.java | 179 +++++++++------------
.../apache/camel/component/as2/AS2Endpoint.java | 24 +--
.../main/docs/atmosphere-websocket-component.adoc | 17 +-
.../camel/http/common/DefaultHttpBinding.java | 28 +++-
.../org/apache/camel/http/common/HttpBinding.java | 14 ++
.../services/KubernetesServicesConsumer.java | 3 +-
.../services/KubernetesServicesProducer.java | 3 +-
.../src/main/docs/micrometer-component.adoc | 6 +-
.../HttpServerMultiplexChannelHandler.java | 1 -
.../camel/component/olingo2/Olingo2Component.java | 2 +
.../camel/component/olingo4/Olingo4Component.java | 2 +
.../camel/component/restlet/RestletProducer.java | 45 +++++-
.../src/main/docs/servlet-component.adoc | 13 +-
.../component/servlet/AttachmentHttpBinding.java | 36 ++++-
.../camel/component/servlet/ServletComponent.java | 28 +++-
.../camel/component/servlet/ServletEndpoint.java | 16 ++
.../component/web3j/Web3jQuorumProducerTest.java | 14 +-
components/readme.adoc | 2 +-
doap.rdf | 2 +-
examples/README.adoc | 28 ++--
.../pom.xml | 8 +-
.../readme.adoc | 79 +++++++++
.../src/main/data/patients.csv | 2 +
.../main/java/sample/camel/MyCamelApplication.java | 37 +++++
.../src/main/java/sample/camel/MyCamelRouter.java | 64 ++++++++
.../src/main/resources/application.properties | 56 +++++++
.../java/sample/camel/MyCamelApplicationTest.java | 55 +++++++
examples/camel-example-fhir-osgi/pom.xml | 2 +-
examples/camel-example-fhir-spring-boot/pom.xml | 2 +-
.../src/main/java/sample/camel/MyCamelRouter.java | 2 +-
examples/camel-example-fhir/pom.xml | 1 +
examples/camel-example-widget-gadget-cdi/pom.xml | 2 +-
examples/camel-example-widget-gadget-java/pom.xml | 2 +-
examples/camel-example-widget-gadget-xml/pom.xml | 2 +-
examples/pom.xml | 1 +
parent/pom.xml | 30 ++--
.../karaf/features/src/main/resources/features.xml | 3 +-
.../as2/springboot/AS2ComponentConfiguration.java | 106 +++++++-----
.../WebsocketComponentConfiguration.java | 15 +-
.../springboot/ServletComponentConfiguration.java | 15 +-
.../camel-spring-boot-dependencies/pom.xml | 2 +-
.../camel/itest/springboot/CamelDrillTest.java | 48 ++++++
.../apache/camel/tools/apt/helper/IOHelper.java | 4 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 4 +-
49 files changed, 854 insertions(+), 331 deletions(-)
copy components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/{ApplicationPkcs7SignatureEntity.java => ApplicationPkcs7Mime.java} (53%)
copy examples/{camel-example-fhir-spring-boot => camel-example-fhir-auth-tx-spring-boot}/pom.xml (94%)
create mode 100644 examples/camel-example-fhir-auth-tx-spring-boot/readme.adoc
create mode 100644 examples/camel-example-fhir-auth-tx-spring-boot/src/main/data/patients.csv
create mode 100644 examples/camel-example-fhir-auth-tx-spring-boot/src/main/java/sample/camel/MyCamelApplication.java
create mode 100644 examples/camel-example-fhir-auth-tx-spring-boot/src/main/java/sample/camel/MyCamelRouter.java
create mode 100644 examples/camel-example-fhir-auth-tx-spring-boot/src/main/resources/application.properties
create mode 100644 examples/camel-example-fhir-auth-tx-spring-boot/src/test/java/sample/camel/MyCamelApplicationTest.java
create mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelDrillTest.java
[camel] 01/05: Temporary disable JDK 9 and karaf-itest builds
Posted by zr...@apache.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 684633e5e722a68631953f30b10d204cb644b778
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jul 20 16:46:23 2018 +0200
Temporary disable JDK 9 and karaf-itest builds
---
Jenkinsfile.daily | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 86051db..3e444ee 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -59,9 +59,9 @@ pipeline {
}
steps {
dir("tests/camel-itest-karaf/") {
- sh "./kill-karaf.sh"
+ sh "true || ./kill-karaf.sh"
script {
- karaf_itests_result = sh script: "./run-tests.sh", returnStatus: true
+ karaf_itests_result = sh script: "true || ./run-tests.sh", returnStatus: true
}
}
}
@@ -86,7 +86,7 @@ pipeline {
}
steps {
script {
- jdk9_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
+ jdk9_result = sh script: "true || ./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
}
}
post {
[camel] 05/05: CAMEL-12618: Additional dependencies needed on ...
Posted by zr...@apache.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 4cbcdc105fedb931a9e12c8112023ba76abf8d0b
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Aug 14 08:56:44 2018 +0200
CAMEL-12618: Additional dependencies needed on ...
...Java 11
Adds additional dependencies needed to compile on Java 11. Java 11
stopped shipping Java EE classes[1], we need to add them as dependencies
now.
[1] http://openjdk.java.net/jeps/320
---
.../src/main/resources/archetype-resources/pom.xml | 17 +++-
camel-core/pom.xml | 113 ++++++++-------------
components/camel-as2/camel-as2-api/pom.xml | 21 ----
components/camel-bam/pom.xml | 58 +++++------
components/camel-bindy/pom.xml | 25 ++---
components/camel-blueprint/pom.xml | 111 ++++++++------------
components/camel-bonita/pom.xml | 24 ++---
components/camel-box/camel-box-api/pom.xml | 21 ----
components/camel-cdi/pom.xml | 78 +++-----------
components/camel-context/pom.xml | 23 +----
components/camel-cxf-transport/pom.xml | 38 ++++---
components/camel-dozer/pom.xml | 5 +
components/camel-fhir/camel-fhir-api/pom.xml | 21 ----
components/camel-grape/pom.xml | 27 -----
components/camel-groovy-dsl/pom.xml | 27 -----
components/camel-grpc/pom.xml | 13 +++
components/camel-guice/pom.xml | 16 +++
components/camel-hl7/pom.xml | 24 ++---
components/camel-ignite/pom.xml | 21 ----
components/camel-infinispan/pom.xml | 32 ------
components/camel-jetty9/pom.xml | 31 +++---
components/camel-jmx/pom.xml | 83 ++++-----------
.../camel-linkedin/camel-linkedin-api/pom.xml | 21 ----
components/camel-mail/pom.xml | 25 ++---
components/camel-mustache/pom.xml | 19 ----
components/camel-netty-http/pom.xml | 16 +++
components/camel-netty4/pom.xml | 26 ++---
components/camel-olingo2/camel-olingo2-api/pom.xml | 22 ----
components/camel-olingo4/camel-olingo4-api/pom.xml | 21 ----
components/camel-ruby/pom.xml | 24 ++---
components/camel-scala/pom.xml | 23 -----
components/camel-soap/pom.xml | 94 ++++-------------
components/camel-spring-boot/pom.xml | 17 +++-
components/camel-spring-javaconfig/pom.xml | 25 ++---
components/camel-spring-redis/pom.xml | 6 ++
components/camel-spring-ws/pom.xml | 73 ++-----------
components/camel-spring/pom.xml | 66 ++++++++++--
components/camel-syslog/pom.xml | 24 ++---
components/camel-telegram/pom.xml | 17 +++-
components/camel-test-blueprint/pom.xml | 24 ++---
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 | 22 ++--
components/camel-testng/pom.xml | 25 ++---
components/camel-thrift/pom.xml | 6 ++
components/camel-undertow/pom.xml | 5 +
components/camel-vertx/pom.xml | 20 ----
components/camel-wordpress/pom.xml | 17 +++-
connectors/camel-connector-maven-plugin/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 ++-
.../hello-camel-grpc-server-kubernetes/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 +++-
.../hello-camel-grpc-server/pom.xml | 18 ++++
.../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-spring-ws/pom.xml | 15 +++
examples/camel-example-transformer-demo/pom.xml | 17 +++-
.../camel-example-validator-spring-boot/pom.xml | 17 +++-
parent/pom.xml | 66 +++++++++++-
platforms/camel-catalog-rest/pom.xml | 4 +-
platforms/spring-boot/components-starter/pom.xml | 17 +++-
tests/camel-blueprint-test/pom.xml | 17 +++-
tooling/apt/pom.xml | 6 ++
.../pom.xml | 27 +----
tooling/maven/camel-package-maven-plugin/pom.xml | 37 ++++---
tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 31 +++---
.../src/it/simple-xml/pom.xml | 1 +
tooling/pom.xml | 27 -----
tooling/swagger-rest-dsl-generator/pom.xml | 5 +
94 files changed, 1163 insertions(+), 1171 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 f5d1c43..63f3b79 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -143,6 +143,41 @@
<version>${project.version}</version>
</dependency>
+ <!-- in Java 11+ JAXB is no longer included -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <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>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- in Java 11+ Activation Framework is no longer included -->
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- in Java 11+ SAAJ is no longer included -->
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ <version>${soap-api-version}</version>
+ <optional>true</optional>
+ </dependency>
+
<!-- required dependencies by camel-core -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -236,6 +271,13 @@
<scope>test</scope>
</dependency>
+ <!-- xmltokenizer using woodstox -->
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
@@ -656,77 +698,8 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>woodstox</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <!-- enable the APT processor -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>apt</artifactId>
- <scope>provided</scope>
- </dependency>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- skip file stress tests as they are intended to run manually -->
- <excludes>
- <exclude>org/apache/camel/component/file/stress/**.java</exclude>
- <exclude>**/DistributedCompletionIntervalTest.java</exclude>
- <exclude>**/DistributedConcurrentPerCorrelationKeyTest.java</exclude>
- <exclude>${platform.skip.tests}</exclude>
- </excludes>
- <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
- <!-- needed for testing the properties component -->
- <environmentVariables>
- <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>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
+
diff --git a/components/camel-as2/camel-as2-api/pom.xml b/components/camel-as2/camel-as2-api/pom.xml
index 342b511..da60a6d 100644
--- a/components/camel-as2/camel-as2-api/pom.xml
+++ b/components/camel-as2/camel-as2-api/pom.xml
@@ -109,25 +109,4 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml
index 790bc26..b127e7d 100644
--- a/components/camel-bam/pom.xml
+++ b/components/camel-bam/pom.xml
@@ -99,8 +99,32 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <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>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/profiles/hibernate</directory>
+ </testResource>
+ </testResources>
+ </build>
+
<profiles>
<!-- Hibernate Derby profile -->
<profile>
@@ -209,39 +233,5 @@
</dependencies>
</profile>
- <profile>
- <id>jdk9+-hibernate</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <testResources>
- <testResource>
- <directory>${basedir}/src/test/profiles/hibernate</directory>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.activation,java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </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>
- </dependencies>
- </profile>
</profiles>
</project>
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index 413f63e..a14cfa7 100644
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -89,6 +89,12 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
@@ -103,23 +109,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
- <argLine>-Duser.language=en -Duser.region=GB --add-modules java.xml.bind,java.xml.ws.annotation --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.xml.ws.annotation/javax.annotation=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 86711ce..32294d0 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -92,6 +92,11 @@
<version>${aries-util-version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
<!-- for testing -->
<dependency>
@@ -230,6 +235,31 @@
</executions>
</plugin>
+ <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>
<pluginManagement>
@@ -251,6 +281,18 @@
</artifactItems>
</configuration>
</plugin>
+ <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>${activation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
<!-- Eclipse m2e Lifecycle Management -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -412,10 +454,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>
@@ -488,71 +530,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- <property>
- <name>!os.unsupported.schemagen</name>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <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>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <reuseForks>true</reuseForks>
- <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- <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..bf9580d 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -88,24 +88,12 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.activation,java.xml.bind</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index 0043d30..7416fdd 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -69,27 +69,6 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>com.box</groupId>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 2f7c7cf..f374e89 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -84,6 +84,17 @@
<artifactId>camel-core</artifactId>
</dependency>
+ <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>
+
<!-- DeltaSpike is only used to provide Main support thus optional -->
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
@@ -507,73 +518,8 @@
</dependencies>
- <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>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>copy</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- <execution>
- <id>copy-jaxb</id>
- <phase>validate</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${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>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</profile>
+
</profiles>
</project>
diff --git a/components/camel-context/pom.xml b/components/camel-context/pom.xml
index 9148299..37bf1bc 100644
--- a/components/camel-context/pom.xml
+++ b/components/camel-context/pom.xml
@@ -82,24 +82,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <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>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 02e1480..de8783e 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -84,6 +84,17 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
+ <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>${webservices-api-version}</version>
+ </dependency>
<!-- OSGi, Blueprint -->
<dependency>
@@ -203,28 +214,15 @@
</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>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <reuseForks>true</reuseForks>
- <argLine>--add-modules java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index a7440c4..bd3c8b4 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -48,6 +48,11 @@
<groupId>com.github.dozermapper</groupId>
<artifactId>dozer-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
<!-- Expressions -->
<dependency>
diff --git a/components/camel-fhir/camel-fhir-api/pom.xml b/components/camel-fhir/camel-fhir-api/pom.xml
index ccd42a8..09768dd 100644
--- a/components/camel-fhir/camel-fhir-api/pom.xml
+++ b/components/camel-fhir/camel-fhir-api/pom.xml
@@ -75,25 +75,4 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index e408f6d..afa39ca 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -143,31 +143,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <!--Skip compile on Java 9 https://issues.apache.org/jira/browse/CAMEL-10905 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>default-testCompile</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-groovy-dsl/pom.xml b/components/camel-groovy-dsl/pom.xml
index 62ac12a..6e89fd3 100644
--- a/components/camel-groovy-dsl/pom.xml
+++ b/components/camel-groovy-dsl/pom.xml
@@ -179,31 +179,4 @@
</testResources>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <!--Skip compile on Java 9 https://issues.apache.org/jira/browse/CAMEL-10905 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-compile</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>default-testCompile</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 01180d6..2724567 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -47,6 +47,18 @@
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc-version}</version>
@@ -220,4 +232,5 @@
</plugin>
</plugins>
</build>
+
</project>
diff --git a/components/camel-guice/pom.xml b/components/camel-guice/pom.xml
index dcda484..5dc6d4a 100644
--- a/components/camel-guice/pom.xml
+++ b/components/camel-guice/pom.xml
@@ -91,4 +91,20 @@
<scope>test</scope>
</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-hl7/pom.xml b/components/camel-hl7/pom.xml
index 6982cd3..a439eb5 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -145,24 +145,12 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index d99a91e..a13bfeb 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -99,25 +99,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- TODO: See https://issues.apache.org/jira/browse/IGNITE-4615 for more information. -->
- <exclude>**/**.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-infinispan/pom.xml b/components/camel-infinispan/pom.xml
index 4a46d01..6304c89 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -153,40 +153,8 @@
</dependency>
</dependencies>
- <!-- unit testing requires java 8 -->
<profiles>
<profile>
- <id>jdk8-test</id>
- <activation>
- <jdk>!1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <id>default-testCompile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>infinispan-itests</id>
<activation>
<activeByDefault>false</activeByDefault>
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index 101bed7..43707dd 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -171,6 +171,18 @@
<artifactId>httpclient</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -188,23 +200,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <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>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 10aebc4..d02487d 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -42,6 +42,17 @@
<artifactId>camel-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -76,67 +87,13 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk8-build</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- TODO: This is a temporary workaround until org.codehaus.mojo:jaxb2-maven-plugin supports JDK9.
- (https://github.com/mojohaus/jaxb2-maven-plugin/issues/43). We need to add the plugin back
- once we are sure it works on both JDK8 and JDK9.
- See https://issues.apache.org/jira/browse/CAMEL-10141 for more info. -->
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-plugin</artifactId>
- <version>${cxf-xjc-plugin-version}</version>
- <configuration>
- <extensions>
- <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
- </extensions>
- </configuration>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
- <sourceRoot>${basedir}/target/xjc</sourceRoot>
- <xsdOptions>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/notifications.xsd</xsd>
- <packagename>org.apache.camel.component.jmx.jaxb</packagename>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml b/components/camel-linkedin/camel-linkedin-api/pom.xml
index cefbdb6..4816523 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -210,25 +210,4 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 4c9cc48..eee5165 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -125,6 +125,12 @@
<version>${assertj-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -140,23 +146,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- required to make MailMimeDecodeHeadersTest work on operating systems with a different default encoding -->
- <argLine>-Dfile.encoding=UTF-8 --add-modules java.activation,java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml
index 5bfc721..9f3bcbd 100644
--- a/components/camel-mustache/pom.xml
+++ b/components/camel-mustache/pom.xml
@@ -72,23 +72,4 @@
</dependencies>
- <!-- unit testing requires java 8 -->
- <profiles>
- <profile>
- <id>jdk8-test</id>
- <activation>
- <jdk>!1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml
index f6e558f..a00043b 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -95,4 +95,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-netty4/pom.xml b/components/camel-netty4/pom.xml
index dca3ecf..25e6ee8 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -81,26 +81,12 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
</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>
- </profiles>
-
</project>
diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml
index d2cca42..5667478 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -115,26 +115,4 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin-version}</version>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-olingo4/camel-olingo4-api/pom.xml b/components/camel-olingo4/camel-olingo4-api/pom.xml
index 37b6aa5..342b875 100644
--- a/components/camel-olingo4/camel-olingo4-api/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-api/pom.xml
@@ -129,25 +129,4 @@
</plugins>
</build>
- <!-- Disable Java 8 doclint checks to avoid Javadoc plugin failures -->
- <profiles>
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-ruby/pom.xml b/components/camel-ruby/pom.xml
index c3cd5a4..9077cf4 100644
--- a/components/camel-ruby/pom.xml
+++ b/components/camel-ruby/pom.xml
@@ -49,6 +49,12 @@
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ <optional>true</optional>
+ </dependency>
<!-- test dependencies -->
<dependency>
@@ -78,22 +84,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <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.util.regex=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index cdb1574..9541356 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -209,27 +209,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <!--Skip compile on Java 9 https://issues.apache.org/jira/browse/CAMEL-10904 -->
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>default</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index c210462..a1c1583 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -53,11 +53,25 @@
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>webservices-api</artifactId>
+ <version>${webservices-api-version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
-
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -104,6 +118,10 @@
<build>
<plugins>
<plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-plugin</artifactId>
<version>${cxf-xjc-plugin-version}</version>
@@ -200,78 +218,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk8-build</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- TODO: This is a temporary workaround until org.codehaus.mojo:jaxb2-maven-plugin supports JDK9.
- (https://github.com/mojohaus/jaxb2-maven-plugin/issues/43). We need to add the plugin back
- once we are sure it works on both JDK8 and JDK9.
- See https://issues.apache.org/jira/browse/CAMEL-10141 for more info. -->
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-plugin</artifactId>
- <version>${cxf-xjc-plugin-version}</version>
- <configuration>
- <extensions>
- <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
- </extensions>
- </configuration>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <fork>${cxf.codegenplugin.forkmode}</fork>
- <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
- <sourceRoot>${basedir}/target/xjc</sourceRoot>
- <xsdOptions>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/soap.xsd</xsd>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/soap12.xsd</xsd>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/xml.xsd</xsd>
- <extensionArgs>
- <extensionArg>-Xfluent-api</extensionArg>
- </extensionArgs>
- </xsdOption>
- </xsdOptions>
- </configuration>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index b1a0676..e2a7028 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -159,9 +159,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -175,5 +175,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..979f14c 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -61,6 +61,12 @@
<version>${cglib-bundle-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -94,23 +100,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <reuseForks>true</reuseForks>
- <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>
- </profiles>
</project>
diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml
index 372bd46..a84faa2 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -82,6 +82,12 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index bb7cea9..645a679 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -76,6 +76,17 @@
<version>${spring-ws-version}</version>
</dependency>
+ <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>
+
<!-- test dependencies -->
<dependency>
<groupId>org.springframework.ws</groupId>
@@ -186,66 +197,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</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>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>copy</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jvnet.staxex</groupId>
- <artifactId>stax-ex</artifactId>
- <version>1.7.8</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>1.3.28</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.basedir}/target/java9</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </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..d86c62a 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -83,24 +83,12 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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..2ea65d4 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -62,6 +62,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
<!-- the ordering of the dependencies can matter as we load the dependencies from the classpath
with felix-connect, and you may get a weird error if wrong order -->
<dependency>
@@ -176,22 +182,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <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</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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 ceb0f51..c15f87e 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..4e115bd 100644
--- a/components/camel-testcontainers/pom.xml
+++ b/components/camel-testcontainers/pom.xml
@@ -72,26 +72,16 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
<!-- activate integration test if the docker socket file is accessible -->
<profile>
diff --git a/components/camel-testng/pom.xml b/components/camel-testng/pom.xml
index 1ad175d..5be396a 100644
--- a/components/camel-testng/pom.xml
+++ b/components/camel-testng/pom.xml
@@ -63,6 +63,12 @@
<artifactId>testng</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
<!-- optional dependencies for running tests -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -82,23 +88,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <reuseForks>true</reuseForks>
- <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-thrift/pom.xml b/components/camel-thrift/pom.xml
index 09bfba1..712c97e 100644
--- a/components/camel-thrift/pom.xml
+++ b/components/camel-thrift/pom.xml
@@ -105,6 +105,12 @@
<version>${junit-toolbox-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 7dc8d48..56703df 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -55,6 +55,11 @@
<artifactId>undertow-core</artifactId>
<version>${undertow-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
<!-- testing -->
<dependency>
diff --git a/components/camel-vertx/pom.xml b/components/camel-vertx/pom.xml
index c39b746..172afac 100644
--- a/components/camel-vertx/pom.xml
+++ b/components/camel-vertx/pom.xml
@@ -77,24 +77,4 @@
</dependency>
</dependencies>
- <!-- unit testing requires java 8 -->
- <profiles>
- <profile>
- <id>jdk8-test</id>
- <activation>
- <jdk>!1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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/camel-connector-maven-plugin/pom.xml b/connectors/camel-connector-maven-plugin/pom.xml
index a77590c..6cd3190 100644
--- a/connectors/camel-connector-maven-plugin/pom.xml
+++ b/connectors/camel-connector-maven-plugin/pom.xml
@@ -123,4 +123,21 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-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 6528b12..607febc 100644
--- a/examples/camel-example-cdi-metrics/pom.xml
+++ b/examples/camel-example-cdi-metrics/pom.xml
@@ -137,9 +137,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -152,5 +152,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 7a3b533..22402f7 100644
--- a/examples/camel-example-cdi-properties/pom.xml
+++ b/examples/camel-example-cdi-properties/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-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml
index b202c9a..9dfa724 100644
--- a/examples/camel-example-cdi-rest-servlet/pom.xml
+++ b/examples/camel-example-cdi-rest-servlet/pom.xml
@@ -178,7 +178,7 @@
</dependencies>
</profile>
<profile>
- <id>jdk9+-build-jetty</id>
+ <id>jdk9+-jetty</id>
<activation>
<jdk>[9,)</jdk>
</activation>
@@ -208,6 +208,12 @@
</exclusions>
</dependency>
</dependencies>
+ </profile>
+ <profile>
+ <id>jdk9-10-build</id>
+ <activation>
+ <jdk>[9,10]</jdk>
+ </activation>
<build>
<plugins>
<plugin>
@@ -219,6 +225,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 35b7e86..7e4cdb9 100644
--- a/examples/camel-example-cdi-test/pom.xml
+++ b/examples/camel-example-cdi-test/pom.xml
@@ -118,9 +118,9 @@
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -133,5 +133,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-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
index b526418..535e77b 100644
--- a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
+++ b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
@@ -165,5 +165,18 @@
</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>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
-</project>
\ No newline at end of file
+</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-grpc/hello-camel-grpc-server/pom.xml b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
index a12ec56..0b3c47a 100644
--- a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
+++ b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
@@ -108,4 +108,22 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-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-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml
index 02e896b..33ecaea 100644
--- a/examples/camel-example-spring-ws/pom.xml
+++ b/examples/camel-example-spring-ws/pom.xml
@@ -129,4 +129,19 @@
</build>
+ <profiles>
+ <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-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 cd315e6..24e1bbd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,10 +40,12 @@
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
- <activemq-version>5.15.4</activemq-version>
+ <activation-api-version>1.2.0</activation-api-version>
<activemq-artemis-version>2.6.2</activemq-artemis-version>
+ <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>
@@ -170,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>
@@ -625,6 +627,7 @@
<snakeyaml-version>1.21</snakeyaml-version>
<snappy-version>1.1.4</snappy-version>
<snmp4j-version>2.6.3_1</snmp4j-version>
+ <soap-api-version>1.4.0</soap-api-version>
<solr-bundle-version>7.2.1_1</solr-bundle-version>
<!-- solr version aligned with lucene -->
<solr-version>7.2.1</solr-version>
@@ -704,6 +707,7 @@
<vysper-version>0.7</vysper-version>
<web3j-version>3.5.0</web3j-version>
<web3j-quorum-version>0.8.0</web3j-quorum-version>
+ <webservices-api-version>2.1-b16</webservices-api-version>
<weld1-version>1.1.28.Final</weld1-version>
<weld2-version>2.4.7.Final</weld2-version>
<weld3-version>3.0.5.Final</weld3-version>
@@ -5256,7 +5260,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.8.3</version>
+ <version>0.14.0</version>
<executions>
<execution>
<goals>
@@ -5729,9 +5733,9 @@
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</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-open [...]
@@ -5785,5 +5789,57 @@
</pluginManagement>
</build>
</profile>
+
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <properties>
+ <cxf.codegen.jvmArgs>--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-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-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-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.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 [...]
+ </properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-package-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin-version}</version>
+ <configuration>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ <maxmem>512M</maxmem>
+ <fork>true</fork>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!--lets avoid polluting every pom.xml as these settings are almost always needed-->
+ <configuration>
+ <argLine>${camel.surefire.fork.vmargs}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
</project>
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 d961b69..b20c97b 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -370,9 +370,9 @@
</modules>
<profiles>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
@@ -385,5 +385,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/apt/pom.xml b/tooling/apt/pom.xml
index 6afd3aa..5381f49 100644
--- a/tooling/apt/pom.xml
+++ b/tooling/apt/pom.xml
@@ -51,6 +51,12 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
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 95b9b29..67f0ef5 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
@@ -156,7 +156,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>
@@ -180,29 +180,4 @@
</pluginManagement>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 47cf92a..c30c92e 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -162,6 +162,27 @@
<version>${freemarker-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <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>
+ </dependency>
+
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -186,20 +207,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jigsaw</id>
- <activation>
- <jdk>[1.9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3</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 11b0d95..4c35977 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -98,26 +98,25 @@
<artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <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>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jigsaw</id>
- <activation>
- <jdk>[1.9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
index 95307f0..aa623cb 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml/pom.xml
@@ -54,4 +54,5 @@
</plugin>
</plugins>
</build>
+
</project>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 52804e2..d6d127e 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -48,31 +48,4 @@
<module>camel-manual</module>
</modules>
- <!-- profiles>
- <profile>
- <id>build.manual</id>
- <modules>
- <module>camel-manual</module>
- </modules>
- </profile>
- <profile>
- <id>assembly</id>
- <modules>
- <module>camel-manual</module>
- </modules>
- </profile>
- <profile>
- <id>deploy</id>
- <modules>
- <module>camel-manual</module>
- </modules>
- </profile>
- <profile>
- <id>apache-release</id>
- <modules>
- <module>camel-manual</module>
- </modules>
- </profile>
- </profiles -->
-
</project>
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index ca8acb5..0c1ba8f 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -47,6 +47,11 @@
<artifactId>swagger-parser</artifactId>
<version>${swagger-java-parser-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
<!-- test -->
<dependency>
[camel] 03/05: CAMEL-12618: Use fork of maven-plugin-plugin th...
Posted by zr...@apache.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 3de4223a8ec962bd1f7c45e079d7b63be616f7e7
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Jul 18 14:56:45 2018 +0200
CAMEL-12618: Use fork of maven-plugin-plugin th...
...at supports Java 11
Changes the maven-plugin-plugin version used to a fork built by
jitpack.io that contains the Java 11 compatibility needed.
---
tooling/maven/camel-api-component-maven-plugin/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml
index 0070fd6..ff85641 100644
--- a/tooling/maven/camel-api-component-maven-plugin/pom.xml
+++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml
@@ -174,9 +174,9 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>com.github.zregvart.maven-plugin-tools</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
+ <version>MPLUGIN-336-SNAPSHOT</version>
<configuration>
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
[camel] 04/05: CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
Posted by zr...@apache.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 6243155c7bed63747ee1946b4be671d28822b1f5
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Aug 17 12:33:14 2018 +0200
CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
...enplus plugin
There is no released Groovy version that supports Java 11[1], so this
uses a snapshot version in the configuration of the gmavenplus plugin so
the build can be performed on Java 11.
[1] https://issues.apache.org/jira/browse/GROOVY-8727
---
buildingtools/pom.xml | 14 -------
components/camel-grpc/pom.xml | 14 -------
.../camel-olingo2/camel-olingo2-component/pom.xml | 8 ----
components/camel-protobuf/pom.xml | 14 -------
pom.xml | 44 ++++++++++++++++++++++
5 files changed, 44 insertions(+), 50 deletions(-)
diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index 5e8d7bd..4e61020 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -113,20 +113,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-xml</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<!--
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 1802868..01180d6 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -172,20 +172,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
</plugin>
<!-- gRPC and protobuf Java code generator plugin -->
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index ae1606b..8ac9bd9 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -330,14 +330,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index d7a4861..98ced80 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -125,20 +125,6 @@
</configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <version>${groovy-version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
</plugin>
<!-- Protobuf Java code generator plugin -->
diff --git a/pom.xml b/pom.xml
index 7dde856..7a2adc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,17 @@
<enabled>false</enabled>
</releases>
</pluginRepository>
+ <!-- needed for Groovy SNAPSHOTs see gmaven plugin below -->
+ <pluginRepository>
+ <id>oss.jfrog.org-snapshots</id>
+ <url>https://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
</pluginRepositories>
<modules>
@@ -327,6 +338,39 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>${gmavenplus-plugin-version}</version>
+ <dependencies>
+ <!-- until we get a release that fixes https://issues.apache.org/jira/browse/GROOVY-8727
+ we use a snapshot version
+ -->
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <!--<version>${groovy-version}</version>-->
+ <version>3.0.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ <!--<version>${groovy-version}</version>-->
+ <version>3.0.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <!--<version>${groovy-version}</version>-->
+ <version>3.0.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
+
</plugins>
</pluginManagement>
</build>
[camel] 02/05: CAMEL-12618: Use fork of MVEL that supports Jav...
Posted by zr...@apache.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 e0b68e4e6241edffdb36fbb54fb7f1cc361cdbd0
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jul 13 11:43:54 2018 +0200
CAMEL-12618: Use fork of MVEL that supports Jav...
...a 11
Try to fix Java 10 build with MVEL dependency built by jitpack.io.
See mvel/mvel#159[2]
[1] http://openjdk.java.net/jeps/320
[2] https://github.com/mvel/mvel/issues/159
---
tooling/maven/camel-package-maven-plugin/pom.xml | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 50afd0f..47cf92a 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -44,6 +44,17 @@
</dependencies>
</dependencyManagement>
+ <!-- added to allow for Java 10+ compatibility in MVEL
+ there is no release that includes this fix
+ https://github.com/mvel/mvel/issues/159
+ -->
+ <repositories>
+ <repository>
+ <id>jitpack.io</id>
+ <url>https://jitpack.io</url>
+ </repository>
+ </repositories>
+
<dependencies>
<!-- use our patched ordered json-simple parser -->
@@ -53,10 +64,11 @@
<version>${project.version}</version>
</dependency>
+ <!-- see above, targeting MVEL with Java 10+ support -->
<dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- <version>${mvel-version}</version>
+ <groupId>com.github.mvel</groupId>
+ <artifactId>mvel</artifactId>
+ <version>97071e83fb</version>
</dependency>
<dependency>