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/09/27 16:58:18 UTC
[1/5] camel git commit: CAMEL-11850 fix camel-asn1 on JDK9
Repository: camel
Updated Branches:
refs/heads/master 26772c4a6 -> c6973a975
CAMEL-11850 fix camel-asn1 on JDK9
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c3835100
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c3835100
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c3835100
Branch: refs/heads/master
Commit: c3835100e8ac483a614a61595a3292cc97accd01
Parents: 26772c4
Author: jpoth <po...@gmail.com>
Authored: Wed Sep 27 13:25:42 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 27 18:58:00 2017 +0200
----------------------------------------------------------------------
buildingtools/java9-maven-settings | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c3835100/buildingtools/java9-maven-settings
----------------------------------------------------------------------
diff --git a/buildingtools/java9-maven-settings b/buildingtools/java9-maven-settings
index 8168748..7e02947 100755
--- a/buildingtools/java9-maven-settings
+++ b/buildingtools/java9-maven-settings
@@ -1,2 +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 --add-opens java.base/java.util=ALL-UNNAMED"
\ No newline at end of file
+export MAVEN_OPTS="--add-modules java.activation,java.xml.bind --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 --add-opens java.base/java.util=ALL-UNNAMED"
[2/5] camel git commit: CAMEL-11850 fix camel-kubernetes on Java 9
Posted by da...@apache.org.
CAMEL-11850 fix camel-kubernetes 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/494fb90c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/494fb90c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/494fb90c
Branch: refs/heads/master
Commit: 494fb90c6c047465984b005b184c2475ccd6c364
Parents: 5eb29c9
Author: jpoth <po...@gmail.com>
Authored: Wed Sep 27 16:15:06 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 27 18:58:01 2017 +0200
----------------------------------------------------------------------
components/camel-kubernetes/pom.xml | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/494fb90c/components/camel-kubernetes/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index 0d7b72b..87d3132 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -116,4 +116,29 @@
</plugin>
</plugins>
</build>
+
+ <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>
[5/5] camel git commit: CAMEL-11850 upgrade maven-javadoc-plugin to
3.0.0-M1 containing fix for MJAVADOC-485 to pass Java 9 builds
Posted by da...@apache.org.
CAMEL-11850 upgrade maven-javadoc-plugin to 3.0.0-M1 containing fix for MJAVADOC-485 to pass Java 9 builds
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5eb29c9e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5eb29c9e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5eb29c9e
Branch: refs/heads/master
Commit: 5eb29c9eb24cc14fb2e8dbe66364856e9abf96c0
Parents: c383510
Author: jpoth <po...@gmail.com>
Authored: Wed Sep 27 15:46:25 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 27 18:58:01 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5eb29c9e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9b5a29b..935b72d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -475,7 +475,7 @@
<maven-owasp-plugin-version>2.1.1</maven-owasp-plugin-version>
<maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
<maven-jar-plugin-version>3.0.2</maven-jar-plugin-version>
- <maven-javadoc-plugin-version>2.10.4</maven-javadoc-plugin-version>
+ <maven-javadoc-plugin-version>3.0.0-M1</maven-javadoc-plugin-version>
<maven-jboss-as-maven-plugin-version>7.7.Final</maven-jboss-as-maven-plugin-version>
<!-- plugin-plugin 3.5 does not work -->
<maven-plugin-plugin-version>3.4</maven-plugin-plugin-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/5eb29c9e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 748a28b..34a571c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -191,7 +191,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[3/5] camel git commit: CAMEL-11850 upgrade hadoop to 2.7.4 to
include fix for HADOOP-14586 to build on Java 9
Posted by da...@apache.org.
CAMEL-11850 upgrade hadoop to 2.7.4 to include fix for HADOOP-14586 to build 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/4ef9ace8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4ef9ace8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4ef9ace8
Branch: refs/heads/master
Commit: 4ef9ace8dbd6f327b1bf9b76899f129acd4ed28a
Parents: 494fb90
Author: jpoth <po...@gmail.com>
Authored: Wed Sep 27 17:45:49 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 27 18:58:01 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4ef9ace8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 935b72d..9b30560 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -279,7 +279,7 @@
<hadoop-bundle-version>1.2.1_1</hadoop-bundle-version>
<hadoop-version>1.2.1</hadoop-version>
<hadoop2-bundle-version>2.7.2_1</hadoop2-bundle-version>
- <hadoop2-version>2.7.2</hadoop2-version>
+ <hadoop2-version>2.7.4</hadoop2-version>
<hadoop2-protobuf-version>2.5.0</hadoop2-protobuf-version>
<hamcrest-version>2.0.0.0</hamcrest-version>
<hapi-version>2.2</hapi-version>
[4/5] camel git commit: CAMEL-11850 build camel-olingo2-api on Java 9
Posted by da...@apache.org.
CAMEL-11850 build camel-olingo2-api 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/c6973a97
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c6973a97
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c6973a97
Branch: refs/heads/master
Commit: c6973a975cea7c616227d9cfe266f5ba971ef24c
Parents: 4ef9ace
Author: jpoth <po...@gmail.com>
Authored: Wed Sep 27 17:46:34 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Sep 27 18:58:01 2017 +0200
----------------------------------------------------------------------
components/camel-olingo2/camel-olingo2-api/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c6973a97/components/camel-olingo2/camel-olingo2-api/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml
index 5689510..d6ceb1e 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -127,6 +127,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin-version}</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>