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/03/02 17:46:37 UTC
[1/6] camel git commit: CAMEL-10863 upgrade maven-war-plugin for Java
9
Repository: camel
Updated Branches:
refs/heads/master 00ffe70a9 -> 4d6287b3b
CAMEL-10863 upgrade maven-war-plugin for Java 9
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4d6287b3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4d6287b3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4d6287b3
Branch: refs/heads/master
Commit: 4d6287b3bed911ec2e2cbd06b02b5b0112fcbf30
Parents: b21421f
Author: jpoth <po...@gmail.com>
Authored: Thu Mar 2 17:13:14 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 2 18:46:27 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4d6287b3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f465d16..869193b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -439,7 +439,7 @@
<maven-scr-plugin-version>1.19.0</maven-scr-plugin-version>
<maven-shade-plugin-version>2.4.1</maven-shade-plugin-version>
<maven-surefire-report-plugin-version>2.13</maven-surefire-report-plugin-version>
- <maven-war-plugin-version>2.6</maven-war-plugin-version>
+ <maven-war-plugin-version>3.0.0</maven-war-plugin-version>
<mchange-commons-java-version>0.2.11</mchange-commons-java-version>
<metrics-version>3.1.2</metrics-version>
<mina-bundle-version>1.1.7_6</mina-bundle-version>
[5/6] camel git commit: CAMEL-10141 add Maven settings scripts for
Java 9
Posted by da...@apache.org.
CAMEL-10141 add Maven settings scripts for Java 9
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b21421f6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b21421f6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b21421f6
Branch: refs/heads/master
Commit: b21421f6c140fcfeb9720f02753063d754ba49ed
Parents: 2468ba8
Author: jpoth <po...@gmail.com>
Authored: Thu Mar 2 17:12:24 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 2 18:46:27 2017 +0100
----------------------------------------------------------------------
buildingtools/java9-maven-settings | 2 ++
buildingtools/java9-maven-settings.bat | 1 +
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b21421f6/buildingtools/java9-maven-settings
----------------------------------------------------------------------
diff --git a/buildingtools/java9-maven-settings b/buildingtools/java9-maven-settings
new file mode 100755
index 0000000..7e91c83
--- /dev/null
+++ b/buildingtools/java9-maven-settings
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+export MAVEN_OPTS="--add-modules java.activation --add-exports=java.xml/com.sun.org.apache.xml.internal.resolver.tools=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xml.internal.resolver=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --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"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/b21421f6/buildingtools/java9-maven-settings.bat
----------------------------------------------------------------------
diff --git a/buildingtools/java9-maven-settings.bat b/buildingtools/java9-maven-settings.bat
new file mode 100644
index 0000000..9a763c6
--- /dev/null
+++ b/buildingtools/java9-maven-settings.bat
@@ -0,0 +1 @@
+set MAVEN_OPTS="--add-modules java.activation --add-exports=java.xml/com.sun.org.apache.xml.internal.resolver.tools=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xml.internal.resolver=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --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"
\ No newline at end of file
[6/6] camel git commit: CAMEL-10895 Skip compile xmlbeans on Java 9
Posted by da...@apache.org.
CAMEL-10895 Skip compile xmlbeans 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/67522e7a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/67522e7a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/67522e7a
Branch: refs/heads/master
Commit: 67522e7a3dafb4952c5d5842632b324a8f1f5f48
Parents: a481a48
Author: jpoth <po...@gmail.com>
Authored: Wed Mar 1 16:32:50 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 2 18:46:27 2017 +0100
----------------------------------------------------------------------
components/camel-xmlbeans/pom.xml | 39 ++++++++++++++++++++
.../camel-xmlbeans-starter/pom.xml | 28 ++++++++++++++
2 files changed, 67 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/67522e7a/components/camel-xmlbeans/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-xmlbeans/pom.xml b/components/camel-xmlbeans/pom.xml
index c03bb2f..73f4af9 100644
--- a/components/camel-xmlbeans/pom.xml
+++ b/components/camel-xmlbeans/pom.xml
@@ -134,4 +134,43 @@
</plugin>
</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-10895 -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xmlbeans-maven-plugin</artifactId>
+ <version>${xmlbeans-maven-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>generate-sources</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>
http://git-wip-us.apache.org/repos/asf/camel/blob/67522e7a/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml
index b9e4e86..99a028f 100644
--- a/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml
@@ -48,4 +48,32 @@
</dependency>
<!--END OF GENERATED CODE-->
</dependencies>
+
+ <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-10895 -->
+ <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>
[3/6] camel git commit: CAMEL-10904 Skip compile scala projects on
Java 9
Posted by da...@apache.org.
CAMEL-10904 Skip compile scala projects 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/d2d658cb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d2d658cb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d2d658cb
Branch: refs/heads/master
Commit: d2d658cb00a7841119af21be923049543beac8b0
Parents: 00ffe70
Author: jpoth <po...@gmail.com>
Authored: Wed Mar 1 16:21:23 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 2 18:46:27 2017 +0100
----------------------------------------------------------------------
components/camel-scala/pom.xml | 23 +++++++++++++++++++
components/camel-swagger/pom.xml | 37 +++++++++++++++++++++++++++++++
examples/camel-example-scala/pom.xml | 23 +++++++++++++++++++
3 files changed, 83 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d2d658cb/components/camel-scala/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index 8e52e72..5a02a63 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -206,4 +206,27 @@
</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>
http://git-wip-us.apache.org/repos/asf/camel/blob/d2d658cb/components/camel-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml
index 74861fc..6f0a52f 100644
--- a/components/camel-swagger/pom.xml
+++ b/components/camel-swagger/pom.xml
@@ -181,4 +181,41 @@
</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>
http://git-wip-us.apache.org/repos/asf/camel/blob/d2d658cb/examples/camel-example-scala/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-scala/pom.xml b/examples/camel-example-scala/pom.xml
index 40eec57..3aa8bc2 100644
--- a/examples/camel-example-scala/pom.xml
+++ b/examples/camel-example-scala/pom.xml
@@ -154,4 +154,27 @@
</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>
[2/6] camel git commit: CAMEL-10922 replace jaxb2-maven-plugin with
cxf-xjc-plugin on Java 9
Posted by da...@apache.org.
CAMEL-10922 replace jaxb2-maven-plugin with cxf-xjc-plugin 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/2468ba87
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2468ba87
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2468ba87
Branch: refs/heads/master
Commit: 2468ba87b3f86ebec2d663ebf75a2b215e516700
Parents: 67522e7
Author: jpoth <po...@gmail.com>
Authored: Thu Mar 2 14:58:19 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 2 18:46:27 2017 +0100
----------------------------------------------------------------------
components/camel-jmx/pom.xml | 72 ++++++++++++++++++++++++++++-----
components/camel-soap/pom.xml | 83 +++++++++++++++++++++++++++++++++++---
parent/pom.xml | 2 +
3 files changed, 143 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2468ba87/components/camel-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 0e22ee2..f50fe74 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -74,13 +74,67 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- </plugin>
- </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/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>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/2468ba87/components/camel-soap/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index 0ff0ff9..89bc3b1 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -124,11 +124,6 @@
</configuration>
</plugin>
<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>
@@ -140,6 +135,8 @@
<goal>xsdtojava-tests</goal>
</goals>
<configuration>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<xsdOptions>
<xsdOption>
@@ -173,6 +170,8 @@
<id>generate-sources-wsdl</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>
@@ -221,4 +220,78 @@
</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>
http://git-wip-us.apache.org/repos/asf/camel/blob/2468ba87/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 814b674..f465d16 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -33,6 +33,7 @@
<compiler.fork>true</compiler.fork>
<cxf.codegenplugin.forkmode>once</cxf.codegenplugin.forkmode>
<cxf.codegen.jvmArgs/>
+ <cxf.xjc.jvmArgs/>
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
@@ -5109,6 +5110,7 @@
</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.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 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>
</properties>
<build>
[4/6] camel git commit: CAMEL-10905 Skip compile groovy projects on
Java 9
Posted by da...@apache.org.
CAMEL-10905 Skip compile groovy projects 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/a481a486
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a481a486
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a481a486
Branch: refs/heads/master
Commit: a481a486fb0763ebd35e73b3c378bcfd6a677fb9
Parents: d2d658c
Author: jpoth <po...@gmail.com>
Authored: Wed Mar 1 16:31:46 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 2 18:46:27 2017 +0100
----------------------------------------------------------------------
components/camel-grape/pom.xml | 27 +++++++++++++++++++++++++++
components/camel-groovy/pom.xml | 28 ++++++++++++++++++++++++++++
examples/camel-example-groovy/pom.xml | 27 +++++++++++++++++++++++++++
3 files changed, 82 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a481a486/components/camel-grape/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index 0bc325e..eef24ee 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -142,4 +142,31 @@
</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>
http://git-wip-us.apache.org/repos/asf/camel/blob/a481a486/components/camel-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml
index 6a84e4f..1ffdfb2 100644
--- a/components/camel-groovy/pom.xml
+++ b/components/camel-groovy/pom.xml
@@ -171,4 +171,32 @@
</testResource>
</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>
http://git-wip-us.apache.org/repos/asf/camel/blob/a481a486/examples/camel-example-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-groovy/pom.xml b/examples/camel-example-groovy/pom.xml
index a050ce6..839996a 100644
--- a/examples/camel-example-groovy/pom.xml
+++ b/examples/camel-example-groovy/pom.xml
@@ -140,4 +140,31 @@
</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>