You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2018/11/06 11:44:23 UTC
[camel] branch java-10-test updated (e77c8ba -> 5b2564e)
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 e77c8ba CAMEL-12618: Additional dependencies needed on ...
discard 1e78a71 update velocity/pom.xml
discard 8dea426 Upgrade Scala to 2.12.7
discard 4bba2a8 Upgrade Spring Boot to 2.1.0.RELEASE
discard dec5620 Upgrade Spring framework to 5.1.2.RELEASE
discard de2c930 Upgrade Hibernate to 5.3.6.Final
discard 8d0f5f7 CAMEL-12618: upgrade Groovy Eclipse compiler
discard dda0e4c CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
discard 4c29aaf CAMEL-12618: Use fork of MVEL that supports Jav...
discard b4994fe Temporary disable JDK 9 and karaf-itest and spr...
add d35b028 Upgrade jSMPP to version 2.3.7
add dfc2c80 Upgrade Zipkin to version 2.11.8
add 6d03f40 Changed the version range of Atmosphere Websocket
add 2b3f416 Removed ServiceMix reference
add be74b81 Fixed using OSGI blueprint with camel docs
add 453dd41 Added using OSGi blueprint link to adoc
add e0aba10 [CAMEL-12911]gzip Content-Encoding problems after upgrading to Jetty 9.4.12
add c6eb959 Added Endpoint completer to adoc
add a79ed22 Added Endpoint Completer to Summary
add dd87055 Added Uris to Summary
add b7d81e7 Upgrade Spring framework to 5.1.2.RELEASE
add de9fab6 Upgrade Spring Boot to 2.1.0.RELEASE
add db0501e Upgrade Spring Boot to 2.1.0.RELEASE. The BOM generator needed a code change as SB guys have changed their POM in this new version.
add 9cbc320 Regen
add 3c01356 Upgrade Braintree Java to version 2.86.0
add eca702d Upgrade TestContainers to version 1.10.0
add 4d04d2a Upgrade EhCache to version 2.10.6
new b795445 Temporary disable JDK 9 and karaf-itest and spr...
new 4fadee2 CAMEL-12618: Use fork of MVEL that supports Jav...
new 6268c7c CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
new cf535e9 CAMEL-12618: upgrade Groovy Eclipse compiler
new ee8b838 Upgrade Hibernate to 5.3.6.Final
new 0c70cbc Upgrade Scala to 2.12.7
new 9a23f05 update velocity/pom.xml
new 58755c2 CAMEL-12618: Additional dependencies needed on ...
new d6d32bc CAMEL-12618: Revert to Groovy 2.5.3
new 5b2564e CAMEL-12618: Prevent Maven Shade plugin from ha...
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 (e77c8ba)
\
N -- N -- N refs/heads/java-10-test (5b2564e)
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 10 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:
buildingtools/pom.xml | 16 +++++++-
.../camel-cache/src/main/docs/cache-component.adoc | 2 +-
.../src/main/docs/consul-component.adoc | 6 +--
.../src/main/docs/disruptor-component.adoc | 4 +-
.../src/main/docs/ehcache-component.adoc | 2 +-
components/camel-grpc/pom.xml | 14 +++++++
.../src/main/docs/infinispan-component.adoc | 2 +-
.../component/jetty9/AttachmentHttpBinding.java | 7 ++++
.../camel-jms/src/main/docs/jms-component.adoc | 2 +-
.../camel-mllp/src/main/docs/mllp-component.adoc | 4 +-
.../src/main/docs/nagios-component.adoc | 2 +-
.../camel-netty/src/main/docs/netty-component.adoc | 10 ++---
.../src/main/docs/netty4-component.adoc | 12 +++---
.../camel-olingo2/camel-olingo2-component/pom.xml | 8 ++++
components/camel-protobuf/pom.xml | 14 +++++++
.../camel-ssh/src/main/docs/ssh-component.adoc | 4 +-
.../src/main/docs/zookeeper-component.adoc | 2 +-
docs/user-manual/en/SUMMARY.md | 7 ++--
docs/user-manual/en/endpoint-completer.adoc | 27 +++++++++++++
.../en/using-osgi-blueprint-with-camel.adoc | 11 ++----
parent/pom.xml | 14 +++----
platforms/camel-catalog/pom.xml | 1 +
platforms/spring-boot/spring-boot-dm/pom.xml | 8 ++--
pom.xml | 44 ----------------------
.../maven/bom/generator/BomGeneratorMojo.java | 4 ++
25 files changed, 134 insertions(+), 93 deletions(-)
create mode 100644 docs/user-manual/en/endpoint-completer.adoc
[camel] 02/10: 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 4fadee29720b78ec509691003e194c636c18d856
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 ed4a0b7..62c9bc9 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>
[camel] 01/10: Temporary disable JDK 9 and karaf-itest and spr...
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 b79544549d448c3848ac12afe2df6eca8fc6ec31
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Aug 22 14:38:04 2018 +0200
Temporary disable JDK 9 and karaf-itest and spr...
...ing-itest builds
---
Jenkinsfile.daily | 42 +++---------------------------------------
1 file changed, 3 insertions(+), 39 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 86051db..9783c16 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
}
}
}
@@ -74,48 +74,12 @@ pipeline {
steps {
dir("tests/camel-itest-spring-boot/") {
script {
- spring_boot_itests_result = sh script: "../../mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
+ spring_boot_itests_result = sh script: "true || ../../mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
}
}
}
}
- stage('Test JDK 9') {
- tools {
- jdk 'JDK 1.9 (latest)'
- }
- steps {
- script {
- jdk9_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
- }
- }
- post {
- always {
- junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml'
- junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/*.xml'
- sh "find . -path '*/target/surefire-reports/*' -delete -o -path '*/target/failsafe-reports/*' -delete"
- }
- }
- }
-
- stage('Test JDK 10') {
- tools {
- jdk 'JDK 10 (latest)'
- }
- steps {
- script {
- jdk10_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
- }
- }
- post {
- always {
- junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml'
- junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/*.xml'
- sh "find . -path '*/target/surefire-reports/*' -delete -o -path '*/target/failsafe-reports/*' -delete"
- }
- }
- }
-
stage('Test JDK 11') {
tools {
jdk 'JDK 11 (latest)'
[camel] 07/10: update velocity/pom.xml
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 9a23f05097a2231003beda7150c0203d3c5cf092
Author: önder sezgin <on...@apache.org>
AuthorDate: Fri Nov 2 11:42:04 2018 +0300
update velocity/pom.xml
add activation-api directly
---
components/camel-velocity/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/components/camel-velocity/pom.xml b/components/camel-velocity/pom.xml
index 0b8a9b4..cb96a88 100644
--- a/components/camel-velocity/pom.xml
+++ b/components/camel-velocity/pom.xml
@@ -48,6 +48,13 @@
<artifactId>velocity-engine-core</artifactId>
<version>${velocity-version}</version>
</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>
<!-- test dependencies -->
<dependency>
[camel] 06/10: Upgrade Scala to 2.12.7
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 0c70cbc7ffa338a2f8e3f7c7787379d73a124cb6
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Nov 1 12:59:13 2018 +0100
Upgrade Scala to 2.12.7
---
.mvn/wrapper/maven-wrapper.properties | 2 +-
components/camel-scala/pom.xml | 5 +++++
.../src/main/scala/org/apache/camel/scala/Preamble.scala | 4 ++--
.../scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala | 9 ++++++++-
.../scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala | 4 ++--
parent/pom.xml | 4 ++--
6 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index b573bb5..6c8c0e0 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index cdb1574..0722cca 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -62,6 +62,11 @@
<version>${scalaxml-version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
index a28beeb..1e90953 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
@@ -82,7 +82,7 @@ trait Preamble {
(exchange: Exchange) =>
run(exchange) map {
case () => throw new RuntimeTransformException("Unit result cannot be used in Predicate")
- case v => v
+ case v : Boolean => v
} getOrElse false
override def process(exchange: Exchange) {
@@ -148,4 +148,4 @@ trait Preamble {
* `import org.apache.camel.scala.Preamble._`
*
*/
-object Preamble extends Preamble
\ No newline at end of file
+object Preamble extends Preamble
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
index bc5084e..ff01bce 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
@@ -135,7 +135,14 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
def routingSlip(expression: Exchange => Any) = wrap(target.routingSlip(expression))
def script(expression: Exchange => Any) = wrap(target.script(expression))
- def setBody(expression: Exchange => Any) = wrap(target.setBody(expression))
+ def setBody(expression: Exchange => Any) = {
+ val fn = new java.util.function.Function[Exchange, Any] {
+ override def apply(exchange: Exchange) = {
+ expression(exchange)
+ }
+ }
+ wrap(target.setBody(fn))
+ }
def setFaultBody(expression: Exchange => Any) = wrap(target.setFaultBody(expression))
def setHeader(name: String, expression: Exchange => Any) = wrap(target.setHeader(name, expression))
def setExchangePattern(mep: ExchangePattern) = wrap(target.setExchangePattern(mep))
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
index a1db7a4..21347a0 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
@@ -25,7 +25,7 @@ class SOnCompletionWhenTest extends OnCompletionWhenTest with RouteBuilderSuppor
override def createRouteBuilder = new RouteBuilder {
"direct:start" ==> {
- onCompletion(containsHello(_)) {
+ onCompletion(containsHello(_: Exchange)) {
to("mock:sync")
}
to("mock:result")
@@ -34,4 +34,4 @@ class SOnCompletionWhenTest extends OnCompletionWhenTest with RouteBuilderSuppor
def containsHello(exchange: Exchange) = exchange.getIn.getBody(classOf[String]).contains("Hello")
}
-}
\ No newline at end of file
+}
diff --git a/parent/pom.xml b/parent/pom.xml
index 51c05c7..fe51204 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -604,8 +604,8 @@
<saaj-impl-version>1.3.2_2</saaj-impl-version>
<saxon-bundle-version>9.8.0-14_1</saxon-bundle-version>
<saxon-version>9.8.0-14</saxon-version>
- <scala-version>2.11.7</scala-version>
- <scala-maven-plugin-version>3.2.2</scala-maven-plugin-version>
+ <scala-version>2.12.7</scala-version>
+ <scala-maven-plugin-version>3.4.2</scala-maven-plugin-version>
<scalatest-version>2.2.5</scalatest-version>
<scalaxml-version>1.0.6</scalaxml-version>
<scribe-version>1.3.7</scribe-version>
[camel] 09/10: CAMEL-12618: Revert to Groovy 2.5.3
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 d6d32bceaa6215e65638771bdba0db9ea607c30c
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Nov 6 11:38:54 2018 +0100
CAMEL-12618: Revert to Groovy 2.5.3
---
buildingtools/pom.xml | 16 +++++++-
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, 51 insertions(+), 45 deletions(-)
diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index 4e61020..e4f86a4 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -113,7 +113,21 @@
</configuration>
</execution>
</executions>
- </plugin>
+ <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>
<!--
This is needed so that the camel-checkstyle.xml is
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 6c17e9a..ac31bef 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -179,6 +179,20 @@
</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 8ac9bd9..ae1606b 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -330,6 +330,14 @@
</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 98ced80..9fc51cd 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -125,6 +125,20 @@
</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 5560fe9..9eef4e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,17 +138,6 @@
<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>
<!-- needed for Groovy Eclipse plugin -->
<pluginRepository>
<id>bintray</id>
@@ -351,39 +340,6 @@
<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] 04/10: CAMEL-12618: upgrade Groovy Eclipse compiler
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 cf535e971a5797b53db9f1ca247eb598c17d219a
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Aug 23 10:56:33 2018 +0200
CAMEL-12618: upgrade Groovy Eclipse compiler
---
archetypes/camel-archetype-groovy/pom.xml | 13 ++++++++++++-
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
components/camel-grape/pom.xml | 8 +++-----
components/camel-groovy-dsl/pom.xml | 4 ++--
examples/camel-example-groovy/pom.xml | 4 ++--
parent/pom.xml | 2 ++
pom.xml | 12 ++++++++++++
7 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/archetypes/camel-archetype-groovy/pom.xml b/archetypes/camel-archetype-groovy/pom.xml
index 88d596f..e88d843 100644
--- a/archetypes/camel-archetype-groovy/pom.xml
+++ b/archetypes/camel-archetype-groovy/pom.xml
@@ -46,7 +46,7 @@
<resources>
<resource>
<directory>src/main/resources</directory>
- <filtering>false</filtering>
+ <filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources-filtered</directory>
@@ -56,6 +56,17 @@
</includes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>@</delimiter>
+ </delimiters>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
index ed27546..18b945b 100644
--- a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.9.2-01</version>
+ <version>@groovy-eclipse-compiler-version@</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>2.4.3-01</version>
+ <version>@groovy-eclipse-batch-version@</version>
</dependency>
</dependencies>
</plugin>
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index e408f6d..811d5ac 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -32,8 +32,6 @@
<description>The grape component allows you to fetch, load and manage additional jars when CamelContext is running</description>
<properties>
- <groovy-eclipse-batch.version>2.4.3-01</groovy-eclipse-batch.version>
- <groovy-eclipse-compiler.version>2.9.2-01</groovy-eclipse-compiler.version>
<plexus-compiler-api.version>2.8.3</plexus-compiler-api.version>
<camel.osgi.export.pkg />
</properties>
@@ -95,12 +93,12 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>${groovy-eclipse-batch.version}</version>
+ <version>${groovy-eclipse-batch-version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>${groovy-eclipse-compiler.version}</version>
+ <version>${groovy-eclipse-compiler-version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -115,7 +113,7 @@
<plugin>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>${groovy-eclipse-compiler.version}</version>
+ <version>${groovy-eclipse-compiler-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
diff --git a/components/camel-groovy-dsl/pom.xml b/components/camel-groovy-dsl/pom.xml
index 62ac12a..79db32a 100644
--- a/components/camel-groovy-dsl/pom.xml
+++ b/components/camel-groovy-dsl/pom.xml
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.9.2-01</version>
+ <version>${groovy-eclipse-compiler-version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
@@ -149,7 +149,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>2.4.3-01</version>
+ <version>${groovy-eclipse-batch-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/examples/camel-example-groovy/pom.xml b/examples/camel-example-groovy/pom.xml
index 577f398..c26933b 100644
--- a/examples/camel-example-groovy/pom.xml
+++ b/examples/camel-example-groovy/pom.xml
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.9.2-01</version>
+ <version>${groovy-eclipse-compiler-version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-batch</artifactId>
- <version>2.4.3-01</version>
+ <version>${groovy-eclipse-batch-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0631f59..f4a423c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -268,6 +268,8 @@
<google-mail-guava-version>17.0</google-mail-guava-version>
<google-truth-version>0.30</google-truth-version>
<grizzly-websockets-version>2.3.25</grizzly-websockets-version>
+ <groovy-eclipse-compiler-version>3.0.0-01</groovy-eclipse-compiler-version>
+ <groovy-eclipse-batch-version>2.5.2-01</groovy-eclipse-batch-version>
<grpc-version>1.15.0</grpc-version>
<grpc-google-auth-library-version>0.9.0</grpc-google-auth-library-version>
<grpc-guava-version>20.0</grpc-guava-version>
diff --git a/pom.xml b/pom.xml
index ba44723..5560fe9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,6 +149,18 @@
<enabled>false</enabled>
</releases>
</pluginRepository>
+ <!-- needed for Groovy Eclipse plugin -->
+ <pluginRepository>
+ <id>bintray</id>
+ <url>https://dl.bintray.com/groovy/maven</url>
+ <name>Bintray Repository</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
</pluginRepositories>
<modules>
[camel] 05/10: Upgrade Hibernate to 5.3.6.Final
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 ee8b838a18c56e1704cd588f95d38714d1dc4372
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Sep 24 12:21:46 2018 +0200
Upgrade Hibernate to 5.3.6.Final
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f4a423c..51c05c7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -297,7 +297,7 @@
<hessian-version>4.0.51</hessian-version>
<hdrhistrogram-version>2.1.10</hdrhistrogram-version>
<hibernate-validator-version>6.0.13.Final</hibernate-validator-version>
- <hibernate-version>5.2.16.Final</hibernate-version>
+ <hibernate-version>5.3.6.Final</hibernate-version>
<hikaricp-version>2.3.13</hikaricp-version>
<hk2-version>2.3.0</hk2-version>
<hk2-osgi-resource-version>1.0.1</hk2-osgi-resource-version>
[camel] 08/10: 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 58755c2d9e5c1b968857912376aab51a1b5cf6bd
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Nov 2 17:07:34 2018 +0100
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
---
.../archetype-resources/__artifactId__-api/pom.xml | 21 ---
.../src/main/resources/archetype-resources/pom.xml | 18 ---
camel-core/pom.xml | 112 ++++++---------
components/camel-as2/camel-as2-api/pom.xml | 21 ---
components/camel-bam/pom.xml | 52 +++----
components/camel-bindy/pom.xml | 25 +---
components/camel-blueprint/pom.xml | 104 +++++---------
components/camel-bonita/pom.xml | 25 +---
components/camel-boon/pom.xml | 21 ---
components/camel-box/camel-box-api/pom.xml | 21 ---
components/camel-cdi/pom.xml | 108 +--------------
components/camel-chronicle/pom.xml | 24 +---
.../src/main/docs/cm-sms-component.adoc | 6 +-
components/camel-context/pom.xml | 23 +---
components/camel-cxf-transport/pom.xml | 38 +++--
components/camel-cxf/pom.xml | 20 ---
components/camel-dozer/pom.xml | 5 +
components/camel-ejb/pom.xml | 21 ---
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 | 8 ++
components/camel-guice/pom.xml | 5 +
components/camel-hl7/pom.xml | 24 +---
components/camel-ignite/pom.xml | 21 ---
components/camel-infinispan/pom.xml | 31 -----
components/camel-jaxb/pom.xml | 5 +
components/camel-jetty9/pom.xml | 25 +---
components/camel-jibx/pom.xml | 81 -----------
components/camel-jmx/pom.xml | 78 ++---------
components/camel-jpa/pom.xml | 54 --------
components/camel-kubernetes/pom.xml | 30 +---
.../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 | 6 +
components/camel-netty4-http/pom.xml | 5 +
components/camel-netty4/pom.xml | 20 ---
components/camel-olingo2/camel-olingo2-api/pom.xml | 23 ----
components/camel-olingo4/camel-olingo4-api/pom.xml | 21 ---
components/camel-ruby/pom.xml | 18 ---
components/camel-scala/pom.xml | 28 ----
components/camel-soap/pom.xml | 84 ++---------
components/camel-spark-rest/pom.xml | 20 ---
components/camel-spring-boot/pom.xml | 20 ---
components/camel-spring-javaconfig/pom.xml | 19 ---
components/camel-spring-redis/pom.xml | 5 +
components/camel-spring-ws/pom.xml | 73 ++--------
components/camel-spring/pom.xml | 153 +++++----------------
components/camel-swagger/pom.xml | 37 -----
components/camel-syslog/pom.xml | 24 +---
components/camel-telegram/pom.xml | 16 ---
components/camel-test-blueprint/pom.xml | 18 ---
components/camel-test-spring/pom.xml | 20 ---
components/camel-test/pom.xml | 35 ++---
components/camel-testcontainers-spring/pom.xml | 16 ---
components/camel-testcontainers/pom.xml | 16 ---
components/camel-testng/pom.xml | 19 ---
components/camel-thrift/pom.xml | 8 +-
components/camel-undertow/pom.xml | 5 +
components/camel-velocity/pom.xml | 7 -
components/camel-vertx/pom.xml | 20 ---
components/camel-wordpress/pom.xml | 19 ---
connectors/camel-connector-maven-plugin/pom.xml | 6 +
connectors/examples/beverage-component/pom.xml | 18 ---
connectors/examples/foo-bar-wine-example/pom.xml | 18 ---
connectors/examples/petstore-example/pom.xml | 31 ++---
examples/camel-example-cafe/pom.xml | 20 +--
examples/camel-example-cdi-metrics/pom.xml | 18 ---
examples/camel-example-cdi-properties/pom.xml | 18 ---
examples/camel-example-cdi-rest-servlet/pom.xml | 42 ------
examples/camel-example-cdi-test/pom.xml | 18 ---
examples/camel-example-cxf-blueprint/pom.xml | 20 +--
examples/camel-example-cxf-proxy/pom.xml | 20 +--
examples/camel-example-cxf-tomcat/pom.xml | 34 -----
examples/camel-example-cxf/pom.xml | 20 ---
.../camel-example-fhir-auth-tx-spring-boot/pom.xml | 18 ---
examples/camel-example-fhir-spring-boot/pom.xml | 18 ---
examples/camel-example-groovy/pom.xml | 27 ----
.../hello-camel-grpc-server-kubernetes/pom.xml | 7 +-
examples/camel-example-loan-broker-cxf/pom.xml | 16 ---
examples/camel-example-loan-broker-jms/pom.xml | 16 ---
examples/camel-example-management/pom.xml | 18 ---
examples/camel-example-pojo-messaging/pom.xml | 30 ++--
examples/camel-example-rabbitmq/pom.xml | 18 ---
.../pom.xml | 22 ---
examples/camel-example-reportincident/pom.xml | 18 ---
examples/camel-example-rest-producer/pom.xml | 18 ---
examples/camel-example-scala/pom.xml | 23 ----
.../camel-example-spring-boot-activemq/pom.xml | 20 ---
.../pom.xml | 18 ---
.../hello-camel-grpc-server/pom.xml | 6 +
.../pom.xml | 18 ---
examples/camel-example-spring-boot-master/pom.xml | 18 ---
examples/camel-example-spring-boot-pojo/pom.xml | 18 ---
.../camel-example-spring-boot-rest-jpa/pom.xml | 31 ++---
.../pom.xml | 18 ---
examples/camel-example-spring-boot-xml/pom.xml | 18 ---
examples/camel-example-spring-boot/pom.xml | 18 ---
examples/camel-example-spring-jms/pom.xml | 16 ---
examples/camel-example-transformer-demo/pom.xml | 18 ---
.../camel-example-validator-spring-boot/pom.xml | 18 ---
parent/pom.xml | 69 ++--------
platforms/camel-catalog-rest/pom.xml | 47 -------
platforms/spring-boot/components-starter/pom.xml | 18 ---
.../camel-spring-boot-dependencies/pom.xml | 56 ++++----
tests/camel-blueprint-cxf-test/pom.xml | 22 ---
tests/camel-blueprint-test/pom.xml | 18 ---
tests/camel-itest/pom.xml | 22 ---
tooling/apt/pom.xml | 6 +
.../maven/camel-api-component-maven-plugin/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-dto/pom.xml | 5 +
.../src/it/simple-xml-dto/pom.xml | 5 +
tooling/swagger-rest-dsl-generator/pom.xml | 20 +++
117 files changed, 480 insertions(+), 2598 deletions(-)
diff --git a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml
index 3df8e61..bf291d4 100644
--- a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml
+++ b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-api/pom.xml
@@ -65,25 +65,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/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..5391d7a 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
@@ -150,22 +150,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</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index f5d1c43..840a51d 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -143,6 +143,40 @@
<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>
+ </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 +270,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 +697,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..ce19abd 100644
--- a/components/camel-bam/pom.xml
+++ b/components/camel-bam/pom.xml
@@ -99,8 +99,26 @@
<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>
</dependencies>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/profiles/hibernate</directory>
+ </testResource>
+ </testResources>
+ </build>
+
<profiles>
<!-- Hibernate Derby profile -->
<profile>
@@ -209,39 +227,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..cd0978e 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>
@@ -415,7 +445,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>
@@ -432,6 +462,13 @@
</sources>
<createJavaDocAnnotations>false</createJavaDocAnnotations>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
@@ -488,71 +525,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..dcac0f2 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -88,24 +88,11 @@
<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-boon/pom.xml b/components/camel-boon/pom.xml
index 7a9b239..96e8a80 100644
--- a/components/camel-boon/pom.xml
+++ b/components/camel-boon/pom.xml
@@ -79,25 +79,4 @@
</dependency>
</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://github.com/boonproject/boon/issues/376 for more details-->
- <exclude>**/**.java</exclude>
- </excludes>
- </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 41ea258..34bf27b 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -84,6 +84,12 @@
<artifactId>camel-core</artifactId>
</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>
@@ -493,108 +499,6 @@
</dependencies>
</profile>
- <profile>
- <id>jdk9+-weld-2.0</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
-
- <dependencies>
-
- <!-- provided dependencies -->
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-2.0-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- test dependencies -->
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-impl</artifactId>
- <version>${weld3-version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-embedded</artifactId>
- <version>${arquillian-weld-embedded-version}</version>
- <scope>test</scope>
- </dependency>
-
- </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-chronicle/pom.xml b/components/camel-chronicle/pom.xml
index 8412eeb..b7daaef 100644
--- a/components/camel-chronicle/pom.xml
+++ b/components/camel-chronicle/pom.xml
@@ -103,26 +103,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!--See https://github.com/OpenHFT/Chronicle-Engine/issues/19 for more details-->
- <exclude>**/**.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
+ </project>
diff --git a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
index 4a4b254..19e7abb 100644
--- a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
+++ b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
@@ -62,9 +62,9 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *defaultFrom* (producer) | This is the sender name. The maximum length is 11 characters. | | String)
-| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces the max number. Message can be truncated. Technically the gateway will first check if a message is larger than 160 characters, if so, the message will be cut into multiple 153 characters parts limited by these parameters. | 8 | Max(8L)::Int)
-| *productToken* (producer) | *Required* The unique token to use | | String)
+| *defaultFrom* (producer) | This is the sender name. The maximum length is 11 characters. | | String
+| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces the max number. Message can be truncated. Technically the gateway will first check if a message is larger than 160 characters, if so, the message will be cut into multiple 153 characters parts limited by these parameters. | 8 | Max(8L)Int
+| *productToken* (producer) | *Required* The unique token to use | | String
| *testConnectionOnStartup* (producer) | Whether to test the connection to the SMS Gateway on startup | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
|===
diff --git a/components/camel-context/pom.xml b/components/camel-context/pom.xml
index 9148299..079c95d 100644
--- a/components/camel-context/pom.xml
+++ b/components/camel-context/pom.xml
@@ -42,6 +42,11 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
<!-- testing -->
<dependency>
@@ -84,22 +89,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 --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-cxf/pom.xml b/components/camel-cxf/pom.xml
index 1314600..0300e02 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -488,25 +488,5 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!--ignore tests until CXF-7520 is resolved and released-->
- <exclude>**/**</exclude>
- </excludes>
- </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-ejb/pom.xml b/components/camel-ejb/pom.xml
index 80a6f28..35218b4 100644
--- a/components/camel-ejb/pom.xml
+++ b/components/camel-ejb/pom.xml
@@ -91,25 +91,4 @@
</dependency>
</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/TOMEE-2038 for more details-->
- <exclude>**/**.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-fhir/camel-fhir-api/pom.xml b/components/camel-fhir/camel-fhir-api/pom.xml
index fa3130b..0099bfd 100644
--- a/components/camel-fhir/camel-fhir-api/pom.xml
+++ b/components/camel-fhir/camel-fhir-api/pom.xml
@@ -79,25 +79,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 811d5ac..23da699 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -141,31 +141,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 79db32a..65cf6f3 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..6c17e9a 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -47,6 +47,13 @@
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc-version}</version>
@@ -220,4 +227,5 @@
</plugin>
</plugins>
</build>
+
</project>
diff --git a/components/camel-guice/pom.xml b/components/camel-guice/pom.xml
index dcda484..883ff69 100644
--- a/components/camel-guice/pom.xml
+++ b/components/camel-guice/pom.xml
@@ -56,6 +56,11 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
<!-- testing -->
<dependency>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 6982cd3..6ff9ddd 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -114,6 +114,12 @@
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -147,22 +153,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</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 ada6170..1763105 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -156,37 +156,6 @@
<!-- 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-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index f415811..5a331e3 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -47,6 +47,11 @@
</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>
</dependency>
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index 101bed7..468455f 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -171,6 +171,12 @@
<artifactId>httpclient</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>
<build>
@@ -188,23 +194,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-jibx/pom.xml b/components/camel-jibx/pom.xml
index 684f632..436919f 100644
--- a/components/camel-jibx/pom.xml
+++ b/components/camel-jibx/pom.xml
@@ -76,85 +76,4 @@
</dependency>
</dependencies>
- <!-- Use JiBX plugin to perform the binding of the test classes. -->
- <!-- A profile is used to allow for skipping of the unit tests -->
- <profiles>
- <profile>
- <id>jibx-for-unit-tests</id>
- <activation>
- <property>
- <name>!maven.test.skip</name>
- </property>
- <jdk>[,1.8)</jdk>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <!-- Eclipse m2e Lifecycle Management -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>${lifecycle-mapping-version}</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.jibx</groupId>
- <artifactId>maven-jibx-plugin</artifactId>
- <versionRange>${jibx-version}</versionRange>
- <goals>
- <goal>test-bind</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.jibx</groupId>
- <artifactId>maven-jibx-plugin</artifactId>
- <version>${jibx-version}</version>
- <configuration>
- <directory>${basedir}/src/test/resources/org/apache/camel/dataformat/jibx/</directory>
- <includes>
- <include>purchaseOrder-jibx.xml</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-bind</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <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-jmx/pom.xml b/components/camel-jmx/pom.xml
index 10aebc4..bfe27cc 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -42,6 +42,12 @@
<artifactId>camel-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -76,67 +82,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-jpa/pom.xml b/components/camel-jpa/pom.xml
index d10a5d4..092a0bb 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -223,59 +223,5 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>validate</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa-version}</version>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-javaagent:${project.basedir}/target/openjpa-${openjpa-version}.jar ${camel.surefire.fork.vmargs}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index a17c133..5c0e50f 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -69,6 +69,12 @@
<artifactId>mockwebserver</artifactId>
<version>${mockwebserver-version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -104,28 +110,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>mockwebserver</artifactId>
- <version>${mockwebserver-version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
- </profiles>
</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..f200cad 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -60,6 +60,12 @@
<artifactId>camel-http4</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty4-http/pom.xml
index b83d2bd..e558520 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty4-http/pom.xml
@@ -53,6 +53,11 @@
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api-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-netty4/pom.xml b/components/camel-netty4/pom.xml
index dca3ecf..35990b0 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -83,24 +83,4 @@
</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..cebc8b9 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -93,7 +93,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
<executions>
<execution>
<id>add-javadoc</id>
@@ -115,26 +114,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..bc329e0 100644
--- a/components/camel-ruby/pom.xml
+++ b/components/camel-ruby/pom.xml
@@ -78,22 +78,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 0722cca..9541356 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -62,11 +62,6 @@
<version>${scalaxml-version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>${activation-api-version}</version>
- </dependency>
<!-- test dependencies -->
<dependency>
@@ -214,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..9512ac6 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -53,11 +53,15 @@
</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 +108,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 +208,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-spark-rest/pom.xml b/components/camel-spark-rest/pom.xml
index f459d8b..62356ed 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -144,24 +144,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-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index b1a0676..de5733f 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -156,24 +156,4 @@
</plugin>
</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>--add-modules java.xml.bind</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml
index c8a40d6..b2bff25 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -94,23 +94,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..313a523 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -43,6 +43,11 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>${spring-data-redis-version}</version>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index bb7cea9..515a655 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -58,6 +58,11 @@
<version>${javax.servlet-api-version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>webservices-api</artifactId>
+ <version>${webservices-api-version}</version>
+ </dependency>
<!-- spring -->
<dependency>
@@ -76,6 +81,12 @@
<version>${spring-ws-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..a73a707 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -174,6 +174,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>${woodstox-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- for testing Spring AOP at class level -->
<dependency>
<groupId>org.aspectj</groupId>
@@ -372,7 +379,36 @@
</execution>
</executions>
</plugin>
-
+
+ <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>${activation-api-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
@@ -540,121 +576,6 @@
<platform.skip.tests>org/apache/camel/spring/management/**/*.java</platform.skip.tests>
</properties>
</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>
- <version>${woodstox-version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>jdk8</id>
- <activation>
- <jdk>(,1.8]</jdk>
- </activation>
- <dependencies>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>${woodstox-version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</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>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <!-- xmltokenizer using woodstox -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>${woodstox-version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.3.1</version>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-jxc-jdk9</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>generate schema</id>
- <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>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<reporting>
diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml
index 6bd2930..027ddf90 100644
--- a/components/camel-swagger/pom.xml
+++ b/components/camel-swagger/pom.xml
@@ -183,41 +183,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>
- <plugin>
- <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-syslog/pom.xml b/components/camel-syslog/pom.xml
index d032fc2..e29be15 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -47,6 +47,12 @@
<artifactId>camel-netty4</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -85,22 +91,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</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml
index c5f740e..7bf216c 100644
--- a/components/camel-telegram/pom.xml
+++ b/components/camel-telegram/pom.xml
@@ -140,22 +140,6 @@
</plugins>
</build>
</profile>
- <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-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index 175073b..752c4d5 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -176,22 +176,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..fc7cdb6 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -73,24 +73,4 @@
<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>
- <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-test/pom.xml b/components/camel-test/pom.xml
index 545d167..5aac36b 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -50,8 +50,22 @@
<artifactId>junit</artifactId>
</dependency>
+ <!-- in Java 11+ JAXB is no longer included -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb-version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ <optional>true</optional>
+ </dependency>
+
<!-- optional dependencies for running tests -->
-
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
@@ -67,25 +81,6 @@
<artifactId>log4j-slf4j-impl</artifactId>
<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-testcontainers-spring/pom.xml b/components/camel-testcontainers-spring/pom.xml
index ceb0f51..df22fc5 100644
--- a/components/camel-testcontainers-spring/pom.xml
+++ b/components/camel-testcontainers-spring/pom.xml
@@ -74,22 +74,6 @@
</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-testcontainers/pom.xml b/components/camel-testcontainers/pom.xml
index 4f95cbd..413f0fd 100644
--- a/components/camel-testcontainers/pom.xml
+++ b/components/camel-testcontainers/pom.xml
@@ -76,22 +76,6 @@
</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..495d34d 100644
--- a/components/camel-testng/pom.xml
+++ b/components/camel-testng/pom.xml
@@ -82,23 +82,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..80eca69 100644
--- a/components/camel-thrift/pom.xml
+++ b/components/camel-thrift/pom.xml
@@ -49,7 +49,13 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 7dc8d48..ac748c5 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -51,6 +51,11 @@
<version>${javax.servlet-api-version}</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+ <dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
<version>${undertow-version}</version>
diff --git a/components/camel-velocity/pom.xml b/components/camel-velocity/pom.xml
index cb96a88..0b8a9b4 100644
--- a/components/camel-velocity/pom.xml
+++ b/components/camel-velocity/pom.xml
@@ -48,13 +48,6 @@
<artifactId>velocity-engine-core</artifactId>
<version>${velocity-version}</version>
</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>
<!-- test dependencies -->
<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..30de72a 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -125,23 +125,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</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/connectors/camel-connector-maven-plugin/pom.xml b/connectors/camel-connector-maven-plugin/pom.xml
index a77590c..871afdd 100644
--- a/connectors/camel-connector-maven-plugin/pom.xml
+++ b/connectors/camel-connector-maven-plugin/pom.xml
@@ -51,6 +51,12 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
+
<!-- use jackson json parser -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/connectors/examples/beverage-component/pom.xml b/connectors/examples/beverage-component/pom.xml
index 48d41e2..ea13e2e 100644
--- a/connectors/examples/beverage-component/pom.xml
+++ b/connectors/examples/beverage-component/pom.xml
@@ -93,22 +93,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</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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..2ab5f7d 100644
--- a/connectors/examples/foo-bar-wine-example/pom.xml
+++ b/connectors/examples/foo-bar-wine-example/pom.xml
@@ -105,22 +105,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</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/connectors/examples/petstore-example/pom.xml b/connectors/examples/petstore-example/pom.xml
index cb495e9..ee1afad 100644
--- a/connectors/examples/petstore-example/pom.xml
+++ b/connectors/examples/petstore-example/pom.xml
@@ -88,6 +88,19 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -108,22 +121,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</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-cafe/pom.xml b/examples/camel-example-cafe/pom.xml
index 969c662..d95445e 100644
--- a/examples/camel-example-cafe/pom.xml
+++ b/examples/camel-example-cafe/pom.xml
@@ -120,23 +120,5 @@
</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</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
</project>
diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml
index 6528b12..c0f85c3 100644
--- a/examples/camel-example-cdi-metrics/pom.xml
+++ b/examples/camel-example-cdi-metrics/pom.xml
@@ -135,22 +135,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml
index 7a3b533..388c5f2 100644
--- a/examples/camel-example-cdi-properties/pom.xml
+++ b/examples/camel-example-cdi-properties/pom.xml
@@ -132,22 +132,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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..b33a446 100644
--- a/examples/camel-example-cdi-rest-servlet/pom.xml
+++ b/examples/camel-example-cdi-rest-servlet/pom.xml
@@ -177,48 +177,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>jdk9+-build-jetty</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty9-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-annotations</artifactId>
- <version>${jetty9-version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-jetty-embedded-9</artifactId>
- <version>1.0.0.CR3</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <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>
<build>
diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml
index 35b7e86..69744c7 100644
--- a/examples/camel-example-cdi-test/pom.xml
+++ b/examples/camel-example-cdi-test/pom.xml
@@ -116,22 +116,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-cxf-blueprint/pom.xml b/examples/camel-example-cxf-blueprint/pom.xml
index 32652cb..53fa524 100644
--- a/examples/camel-example-cxf-blueprint/pom.xml
+++ b/examples/camel-example-cxf-blueprint/pom.xml
@@ -99,23 +99,5 @@
</plugin>
</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.activation,java.xml.bind,java.xml.ws,jdk.xml.bind --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 --add-exports=java.xml.ws/com.sun.xml.internal.messaging.saaj.soap.impl=ALL-UNNA [...]
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
</project>
diff --git a/examples/camel-example-cxf-proxy/pom.xml b/examples/camel-example-cxf-proxy/pom.xml
index 49dfa31..985b76b 100644
--- a/examples/camel-example-cxf-proxy/pom.xml
+++ b/examples/camel-example-cxf-proxy/pom.xml
@@ -151,23 +151,5 @@
</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.activation,java.xml.bind,java.xml.ws,jdk.xml.bind --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 --add-exports=java.xml.ws/com.sun.xml.internal.messaging.saaj.soap.impl=ALL-UNNA [...]
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
</project>
diff --git a/examples/camel-example-cxf-tomcat/pom.xml b/examples/camel-example-cxf-tomcat/pom.xml
index fd50281..0a753b1 100644
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -121,38 +121,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>Tomcat7</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <tomcat.url>http://localhost:8080/manager/text</tomcat.url>
- </properties>
- </profile>
- <profile>
- <id>Tomcat6</id>
- <properties>
- <tomcat.url>http://localhost:8080/manager</tomcat.url>
- </properties>
- </profile>
- <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,java.xml.ws,jdk.xml.bind --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 --add-exports=java.xml.ws/com.sun.xml.internal.messaging.saaj.soap.impl=ALL-UNNA [...]
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.xml
index d8d7511..1d01344 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -243,26 +243,6 @@
<target.main.class>org.apache.camel.example.cxf.jaxrs.Client</target.main.class>
</properties>
</profile>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!--ignore tests until CXF-7520 is resolved and released-->
- <exclude>**/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<build>
diff --git a/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml b/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
index 06148b6..b3a5df1 100644
--- a/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
+++ b/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
@@ -146,22 +146,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-fhir-spring-boot/pom.xml b/examples/camel-example-fhir-spring-boot/pom.xml
index 60b1089..0469e5a 100644
--- a/examples/camel-example-fhir-spring-boot/pom.xml
+++ b/examples/camel-example-fhir-spring-boot/pom.xml
@@ -146,22 +146,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-groovy/pom.xml b/examples/camel-example-groovy/pom.xml
index c26933b..96da0fe 100644
--- a/examples/camel-example-groovy/pom.xml
+++ b/examples/camel-example-groovy/pom.xml
@@ -142,31 +142,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/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..5f89499 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
@@ -53,6 +53,11 @@
<artifactId>grpc-stub</artifactId>
<version>${grpc-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
</dependencies>
<build>
<extensions>
@@ -166,4 +171,4 @@
</build>
</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..5b0907d 100644
--- a/examples/camel-example-loan-broker-cxf/pom.xml
+++ b/examples/camel-example-loan-broker-cxf/pom.xml
@@ -171,22 +171,6 @@
<target.main.class>org.apache.camel.loanbroker.Client</target.main.class>
</properties>
</profile>
- <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-opens java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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..2651a2d 100644
--- a/examples/camel-example-loan-broker-jms/pom.xml
+++ b/examples/camel-example-loan-broker-jms/pom.xml
@@ -179,22 +179,6 @@
<target.main.class>org.apache.camel.loanbroker.Client</target.main.class>
</properties>
</profile>
- <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-opens java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/examples/camel-example-management/pom.xml b/examples/camel-example-management/pom.xml
index f60ff98..fb6b8ca 100644
--- a/examples/camel-example-management/pom.xml
+++ b/examples/camel-example-management/pom.xml
@@ -138,22 +138,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/camel-example-pojo-messaging/pom.xml
index d4a4d99..630644c 100644
--- a/examples/camel-example-pojo-messaging/pom.xml
+++ b/examples/camel-example-pojo-messaging/pom.xml
@@ -119,6 +119,18 @@
<artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -156,22 +168,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-rabbitmq/pom.xml b/examples/camel-example-rabbitmq/pom.xml
index 00c88dc..432e354 100644
--- a/examples/camel-example-rabbitmq/pom.xml
+++ b/examples/camel-example-rabbitmq/pom.xml
@@ -136,22 +136,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-reportincident-wssecurity/pom.xml b/examples/camel-example-reportincident-wssecurity/pom.xml
index 017340a..f1174c2 100644
--- a/examples/camel-example-reportincident-wssecurity/pom.xml
+++ b/examples/camel-example-reportincident-wssecurity/pom.xml
@@ -223,26 +223,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!--ignore tests until CXF-7520 is resolved and released-->
- <exclude>**/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml
index 0cffa44..56084ce 100644
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -196,22 +196,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-opens java.base/java.lang.invoke=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-rest-producer/pom.xml b/examples/camel-example-rest-producer/pom.xml
index d3a88e7..0e1d412 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -132,22 +132,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-scala/pom.xml b/examples/camel-example-scala/pom.xml
index 6fee4eb..bc72d73 100644
--- a/examples/camel-example-scala/pom.xml
+++ b/examples/camel-example-scala/pom.xml
@@ -156,27 +156,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/examples/camel-example-spring-boot-activemq/pom.xml b/examples/camel-example-spring-boot-activemq/pom.xml
index 6ab6da6..222274d 100644
--- a/examples/camel-example-spring-boot-activemq/pom.xml
+++ b/examples/camel-example-spring-boot-activemq/pom.xml
@@ -125,24 +125,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 --add-opens
- java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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..f8c5484 100644
--- a/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
@@ -46,22 +46,4 @@
<module>cluster-node</module>
</modules>
- <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/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..84cdd56 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
@@ -52,6 +52,12 @@
<artifactId>grpc-stub</artifactId>
<version>${grpc-version}</version>
</dependency>
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation-api-version}</version>
+ </dependency>
</dependencies>
<build>
<extensions>
diff --git a/examples/camel-example-spring-boot-health-checks/pom.xml b/examples/camel-example-spring-boot-health-checks/pom.xml
index ecbb3bb..b07f344 100644
--- a/examples/camel-example-spring-boot-health-checks/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/pom.xml
@@ -47,22 +47,4 @@
<module>application</module>
</modules>
- <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/examples/camel-example-spring-boot-master/pom.xml b/examples/camel-example-spring-boot-master/pom.xml
index 034e6f9..839dc05 100644
--- a/examples/camel-example-spring-boot-master/pom.xml
+++ b/examples/camel-example-spring-boot-master/pom.xml
@@ -112,22 +112,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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..e990701 100644
--- a/examples/camel-example-spring-boot-pojo/pom.xml
+++ b/examples/camel-example-spring-boot-pojo/pom.xml
@@ -110,22 +110,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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..21b9701 100644
--- a/examples/camel-example-spring-boot-rest-jpa/pom.xml
+++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml
@@ -124,6 +124,19 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -143,24 +156,6 @@
</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 --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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..95ad76f 100644
--- a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
@@ -139,22 +139,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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..4a81307 100644
--- a/examples/camel-example-spring-boot-xml/pom.xml
+++ b/examples/camel-example-spring-boot-xml/pom.xml
@@ -137,22 +137,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-spring-boot/pom.xml b/examples/camel-example-spring-boot/pom.xml
index 64808c4..e9575c4 100644
--- a/examples/camel-example-spring-boot/pom.xml
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -136,22 +136,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml
index 64fd1e4..92ecfa0 100644
--- a/examples/camel-example-spring-jms/pom.xml
+++ b/examples/camel-example-spring-jms/pom.xml
@@ -144,22 +144,6 @@
<target.main.class>org.apache.camel.example.client.CamelClientEndpoint</target.main.class>
</properties>
</profile>
- <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>
<build>
diff --git a/examples/camel-example-transformer-demo/pom.xml b/examples/camel-example-transformer-demo/pom.xml
index a85874b..b17391f 100644
--- a/examples/camel-example-transformer-demo/pom.xml
+++ b/examples/camel-example-transformer-demo/pom.xml
@@ -104,22 +104,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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..4e2fd05 100644
--- a/examples/camel-example-validator-spring-boot/pom.xml
+++ b/examples/camel-example-validator-spring-boot/pom.xml
@@ -125,22 +125,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index fe51204..fd84bc2 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! -->
+ <activation-api-version>1.2.0</activation-api-version>
<activemq-version>5.15.7</activemq-version>
<activemq-artemis-version>2.6.3</activemq-artemis-version>
<aether-version>1.0.2.v20150114</aether-version>
<ahc-version>2.6.0</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,9 +172,9 @@
<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.6</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-plugin-version>3.2.3</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>3.2.0</cxf-xjc-utils-version>
<deltaspike-version>1.9.0</deltaspike-version>
<depends-maven-plugin-version>1.4.0</depends-maven-plugin-version>
@@ -268,9 +270,9 @@
<google-mail-guava-version>17.0</google-mail-guava-version>
<google-truth-version>0.30</google-truth-version>
<grizzly-websockets-version>2.3.25</grizzly-websockets-version>
+ <grpc-version>1.15.0</grpc-version>
<groovy-eclipse-compiler-version>3.0.0-01</groovy-eclipse-compiler-version>
<groovy-eclipse-batch-version>2.5.2-01</groovy-eclipse-batch-version>
- <grpc-version>1.15.0</grpc-version>
<grpc-google-auth-library-version>0.9.0</grpc-google-auth-library-version>
<grpc-guava-version>20.0</grpc-guava-version>
<grpc-java-jwt-version>3.2.0</grpc-java-jwt-version>
@@ -626,6 +628,7 @@
<snakeyaml-version>1.23</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>
@@ -705,6 +708,7 @@
<vysper-version>0.7</vysper-version>
<web3j-version>3.6.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>
@@ -5267,7 +5271,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>
@@ -5739,62 +5743,5 @@
</build>
</profile>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <properties>
- <cxf.codegen.jvmArgs>--add-modules java.activation,java.xml.bind,java.xml.ws --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.marshaller=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-open [...]
- <cxf.xjc.jvmArgs>--add-modules java.activation,java.xml.bind,java.xml.ws --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.marshaller=ALL-UNNAMED --add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens ja [...]
- <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
- <camel.surefire.fork.vmargs>--add-modules java.xml.bind,java.xml.ws,java.xml.ws.annotation,java.sql --add-opens java.base/javax.net=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED [...]
- </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>
- <compilerArgs>
- <arg>-J--add-modules</arg>
- <arg>-Jjava.xml.bind</arg>
- <!-- SB2 actuator endpoint requires MethodParameter metadata -->
- <arg>-parameters</arg>
- </compilerArgs>
- </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..d062afd 100644
--- a/platforms/camel-catalog-rest/pom.xml
+++ b/platforms/camel-catalog-rest/pom.xml
@@ -173,51 +173,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.ws.annotation=${project.basedir}/target/java9/javax.annotation-api-1.2.jar ${camel.surefire.fork.vmargs}</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>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 07d9880..38b57f6 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -369,22 +369,4 @@
<module>camel-zookeeper-master-starter</module>
<module>camel-zookeeper-starter</module>
</modules>
- <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/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 7bb659d..3f058ba 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3142,142 +3142,142 @@
<dependency>
<groupId>org.apache.cxf.services.sts</groupId>
<artifactId>cxf-services-sts-core</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.services.ws-discovery</groupId>
<artifactId>cxf-services-ws-discovery-api</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-clustering</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-logging</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-mex</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security-oauth2</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
- <version>3.2.6</version>
+ <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>
diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml
index 7b76c01..e220a5b 100644
--- a/tests/camel-blueprint-cxf-test/pom.xml
+++ b/tests/camel-blueprint-cxf-test/pom.xml
@@ -191,26 +191,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>java9+</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!--ignore tests until CXF-7520 is resolved and released-->
- <exclude>**/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/tests/camel-blueprint-test/pom.xml b/tests/camel-blueprint-test/pom.xml
index af08026..17969e9 100644
--- a/tests/camel-blueprint-test/pom.xml
+++ b/tests/camel-blueprint-test/pom.xml
@@ -62,22 +62,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 --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index adfa7d4..f87ac2e 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -469,26 +469,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk9+-build</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- exclude doc tests as they dont work on CI server -->
- <exclude>**/*DocumentationTest.*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </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-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml
index 0070fd6..dc3f3b3 100644
--- a/tooling/maven/camel-api-component-maven-plugin/pom.xml
+++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml
@@ -176,11 +176,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
+ <version>3.6.0</version>
<executions>
<execution>
<id>mojo-descriptor</id>
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..d3b9da4 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.0</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 62c9bc9..4c18371 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>
@@ -206,20 +227,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 7a99f0a..c6b2fff 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -110,6 +110,21 @@
<version>2.3.0</version>
</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>
<version>3.5</version>
@@ -117,20 +132,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/src/it/simple-dto/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
index f30dfe0..55fd1e8 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
@@ -59,6 +59,11 @@
<artifactId>threetenbp</artifactId>
<version>1.3.7</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>@annotation-api-version@</version>
+ </dependency>
</dependencies>
<build>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
index a564b6a..3ffa8cb 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
@@ -59,6 +59,11 @@
<artifactId>threetenbp</artifactId>
<version>1.3.7</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>@annotation-api-version@</version>
+ </dependency>
</dependencies>
<build>
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index ca8acb5..7d3565b 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -47,6 +47,26 @@
<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>
+ <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>
<!-- test -->
<dependency>
[camel] 03/10: 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 6268c7c0e0dca1049fa5dd9f5596aa924c563645
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 5ce708e..ba44723 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>
@@ -328,6 +339,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] 10/10: CAMEL-12618: Prevent Maven Shade plugin from ha...
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 5b2564eda6635702cae110306116491f19b30cfb
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Nov 6 12:43:06 2018 +0100
CAMEL-12618: Prevent Maven Shade plugin from ha...
...nging
When `maven-shade-plugin` is run under Java 11 it tends to hang in:
```
"main" #1 prio=5 os_prio=0 cpu=1597418.82ms elapsed=3787.04s tid=0x00007fc7ec012000 nid=0x7b24 runnable [0x00007fc7f34ae000]
java.lang.Thread.State: RUNNABLE
at org.apache.maven.plugins.shade.pom.MavenJDOMWriter.insertAtPreferredLocation(MavenJDOMWriter.java:272)
at org.apache.maven.plugins.shade.pom.MavenJDOMWriter.iterateExclusion(MavenJDOMWriter.java:488)
at org.apache.maven.plugins.shade.pom.MavenJDOMWriter.updateDependency(MavenJDOMWriter.java:1335)
at org.apache.maven.plugins.shade.pom.MavenJDOMWriter.iterateDependency(MavenJDOMWriter.java:386)
at org.apache.maven.plugins.shade.pom.MavenJDOMWriter.updateModel(MavenJDOMWriter.java:1623)
at org.apache.maven.plugins.shade.pom.MavenJDOMWriter.write(MavenJDOMWriter.java:2156)
at org.apache.maven.plugins.shade.pom.PomWriter.write(PomWriter.java:75)
at org.apache.maven.plugins.shade.mojo.ShadeMojo.rewriteDependencyReducedPomIfWeHaveReduction(ShadeMojo.java:1049)
at org.apache.maven.plugins.shade.mojo.ShadeMojo.createDependencyReducedPom(ShadeMojo.java:978)
at org.apache.maven.plugins.shade.mojo.ShadeMojo.execute(ShadeMojo.java:538)
```
This removes the generation of dependency reduced POM and skips over
the blocking part.
---
platforms/camel-catalog/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/platforms/camel-catalog/pom.xml b/platforms/camel-catalog/pom.xml
index 92e01fd..d491a1d 100644
--- a/platforms/camel-catalog/pom.xml
+++ b/platforms/camel-catalog/pom.xml
@@ -193,6 +193,7 @@
<goal>shade</goal>
</goals>
<configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
<include>org.apache.camel:json-simple-ordered</include>