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 ff390ce2e42904e9496a1d708ae4cb70bd6ab1fd
Author: Zoran Regvart <zregv...@apache.org>
AuthorDate: Mon Jul 16 09:15:48 2018 +0200
CAMEL-12618: Additional dependencies needed on Java 11
Adds additional dependencies needed to compile on Java 11. Java 11
stopped shipping Java EE classes[1],we need to add them as dependencies
now.
[1] http://openjdk.java.net/jeps/320
---
camel-core/pom.xml | 35 +++++++++++++++++++++++++++++--
parent/pom.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++---
tooling/apt/pom.xml | 16 ++++++++++++++
3 files changed, 106 insertions(+), 5 deletions(-)
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 4515891..f2b6646 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -660,9 +660,9 @@
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10)</jdk>
</activation>
<dependencies>
@@ -715,6 +715,37 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <!-- enable the APT processor -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>apt</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>${activation-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ <version>${soap-api-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index 46fb164..59d8187 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,8 +40,9 @@
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
- <activemq-version>5.15.4</activemq-version>
+ <activation-api-version>1.2.0</activation-api-version>
<activemq-artemis-version>2.6.2</activemq-artemis-version>
+ <activemq-version>5.15.4</activemq-version>
<aether-version>1.0.2.v20150114</aether-version>
<ahc-version>2.5.2</ahc-version>
<ant-bundle-version>1.7.0_6</ant-bundle-version>
@@ -625,6 +626,7 @@
<snakeyaml-version>1.21</snakeyaml-version>
<snappy-version>1.1.4</snappy-version>
<snmp4j-version>2.6.2_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>
@@ -5715,9 +5717,9 @@
</profile>
<profile>
- <id>jdk9+-build</id>
+ <id>jdk9-10-build</id>
<activation>
- <jdk>[9,)</jdk>
+ <jdk>[9,10]</jdk>
</activation>
<properties>
<cxf.codegen.jvmArgs>--add-modules
java.activation,java.xml.bind,java.xml.ws
--add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED
--add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED
--add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED
--add-exports=java.xml.bind/com.sun.xml.internal.bind.marshaller=ALL-UNNAMED
--add-opens java.xml.ws/javax.xml.ws.wsaddressing=ALL-UNNAMED --add-opens
java.base/java.security=ALL-UNNAMED --add-open [...]
@@ -5771,5 +5773,57 @@
</pluginManagement>
</build>
</profile>
+
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <properties>
+
<cxf.codegen.jvmArgs>--add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED
--add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED
--add-opens java.base/java.security=ALL-UNNAMED --add-opens
java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED --add-opens
java.base/java.util.concurrent=ALL-UNNAMED</cxf.codegen.jvmArgs>
+
<cxf.xjc.jvmArgs>--add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED
--add-exports=java.xml/com.sun.org.apache.xerces.internal.impl.xs=ALL-UNNAMED
--add-opens java.base/java.security=ALL-UNNAMED --add-opens
java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED --add-opens
java.base/java.util.concurrent=ALL-UNNAMED</cxf.xjc.jvmArgs>
+ <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
+ <camel.surefire.fork.vmargs>--add-modules java.sql --add-opens
java.base/javax.net=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED
--add-opens java.base/java.net=ALL-UNNAMED --add-opens
java.base/java.util.concurrent=ALL-UNNAMED --add-opens
java.base/java.util.regex=ALL-UNNAMED --add-opens
java.desktop/java.awt.font=ALL-UNNAMED --add-opens
java.base/java.lang.reflect=ALL-UNNAMED --add-opens
java.base/java.text=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED
--add [...]
+ </properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-package-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin-version}</version>
+ <configuration>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ <maxmem>512M</maxmem>
+ <fork>true</fork>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!--lets avoid polluting every pom.xml as these settings are
almost always needed-->
+ <configuration>
+ <argLine>${camel.surefire.fork.vmargs}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/tooling/apt/pom.xml b/tooling/apt/pom.xml
index 6afd3aa..c5aefbc 100644
--- a/tooling/apt/pom.xml
+++ b/tooling/apt/pom.xml
@@ -97,4 +97,20 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>jdk11+-build</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
