You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/02/21 16:04:58 UTC
[3/4] camel git commit: CAMEL-10141 make CXF code gen plugin work on
JAVA 9
CAMEL-10141 make CXF code gen plugin work on JAVA 9
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3ea74bca
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3ea74bca
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3ea74bca
Branch: refs/heads/master
Commit: 3ea74bca0ed720ed8eb55c487a4dda36f7e30ca4
Parents: b82839e
Author: jpoth <po...@gmail.com>
Authored: Mon Feb 20 11:01:11 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 21 15:57:28 2017 +0100
----------------------------------------------------------------------
components/camel-cxf-transport/pom.xml | 2 ++
components/camel-cxf/pom.xml | 2 ++
.../camel-linkedin/camel-linkedin-api/pom.xml | 2 ++
examples/camel-example-cxf-blueprint/pom.xml | 2 ++
examples/camel-example-cxf-osgi/pom.xml | 2 ++
examples/camel-example-cxf-proxy/pom.xml | 2 ++
examples/camel-example-cxf/pom.xml | 2 ++
.../pom.xml | 2 ++
examples/camel-example-reportincident/pom.xml | 2 ++
parent/pom.xml | 31 +++++++++++++++++++-
tests/camel-itest/pom.xml | 5 ++--
11 files changed, 50 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3ea74bca/components/camel-cxf-transport/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 2dfbe4e..93d650b 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -195,6 +195,8 @@
<id>generate-test-sources</id>
<phase>generate-sources</phase>
<configuration>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<defaultOptions>
<frontEnd>jaxws21</frontEnd>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ea74bca/components/camel-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 17ac343..70f782e 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -419,6 +419,8 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<defaultOptions>
<frontEnd>jaxws21</frontEnd>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ea74bca/components/camel-linkedin/camel-linkedin-api/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 8e46cc0..9c444f2 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -146,6 +146,8 @@
<goal>wadl2java</goal>
</goals>
<configuration>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<sourceRoot>${project.build.directory}/generated-sources/cxf</sourceRoot>
<wadlOptions>
<wadlOption>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ea74bca/examples/camel-example-cxf-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-blueprint/pom.xml b/examples/camel-example-cxf-blueprint/pom.xml
index 0292da4..6000401 100644
--- a/examples/camel-example-cxf-blueprint/pom.xml
+++ b/examples/camel-example-cxf-blueprint/pom.xml
@@ -80,6 +80,8 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
<wsdlOptions>
<wsdlOption>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ea74bca/examples/camel-example-cxf-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/pom.xml b/examples/camel-example-cxf-osgi/pom.xml
index 06b4337..04e8e79 100644
--- a/examples/camel-example-cxf-osgi/pom.xml
+++ b/examples/camel-example-cxf-osgi/pom.xml
@@ -142,6 +142,8 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
<wsdlOptions>
<wsdlOption>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ea74bca/examples/camel-example-cxf-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-proxy/pom.xml b/examples/camel-example-cxf-proxy/pom.xml
index 6ac65fd..be68c33 100755
--- a/examples/camel-example-cxf-proxy/pom.xml
+++ b/examples/camel-example-cxf-proxy/pom.xml
@@ -128,6 +128,8 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
<wsdlOptions>
<wsdlOption>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ea74bca/examples/camel-example-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.xml
index aa32ed0..cc3f12f 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -257,6 +257,8 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
<wsdlOptions>
<wsdlOption>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ea74bca/examples/camel-example-reportincident-wssecurity/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-reportincident-wssecurity/pom.xml b/examples/camel-example-reportincident-wssecurity/pom.xml
index 4651b77..143583f 100644
--- a/examples/camel-example-reportincident-wssecurity/pom.xml
+++ b/examples/camel-example-reportincident-wssecurity/pom.xml
@@ -202,6 +202,8 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
<wsdlOptions>
<wsdlOption>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ea74bca/examples/camel-example-reportincident/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml
index e988f40..b91bc6a 100755
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -163,6 +163,8 @@
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
<wsdlOptions>
<wsdlOption>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ea74bca/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 654b9a6..b737256 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -31,7 +31,8 @@
<properties>
<compiler.fork>true</compiler.fork>
-
+ <cxf.codegenplugin.forkmode>once</cxf.codegenplugin.forkmode>
+ <cxf.codegen.jvmArgs/>
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
@@ -5081,5 +5082,33 @@
</plugins>
</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-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.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
+ </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>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/3ea74bca/tests/camel-itest/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 97fe8b1..7adb877 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -452,10 +452,9 @@
<id>generate-test-sources</id>
<phase>generate-sources</phase>
<configuration>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>-Dlog4j.configurationFile=${project.basedir}/src/test/resources/log4j2.properties ${cxf.codegen.jvmArgs}</additionalJvmArgs>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
- <additionalJvmArgs>
- -Dlog4j.configurationFile=${project.basedir}/src/test/resources/log4j2.properties
- </additionalJvmArgs>
<wsdlOptions>
<wsdlOption>
<frontEnd>jaxws21</frontEnd>