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:39 UTC
[3/6] camel git commit: CAMEL-10904 Skip compile scala projects on
Java 9
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>