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/14 17:28:11 UTC

[1/6] camel git commit: CAMEL-10141: make camel-elsql unit tests pass on Java 9

Repository: camel
Updated Branches:
  refs/heads/master 689d3c8f0 -> 968fd2b17


CAMEL-10141: make camel-elsql unit tests pass 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/968fd2b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/968fd2b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/968fd2b1

Branch: refs/heads/master
Commit: 968fd2b17db562d5094706a6baa2dcf959ee7a69
Parents: 1901107
Author: jpoth <po...@gmail.com>
Authored: Tue Mar 14 16:23:37 2017 +0100
Committer: jpoth <po...@gmail.com>
Committed: Tue Mar 14 17:49:05 2017 +0100

----------------------------------------------------------------------
 components/camel-elsql/pom.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/968fd2b1/components/camel-elsql/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-elsql/pom.xml b/components/camel-elsql/pom.xml
index 3941882..babf960 100644
--- a/components/camel-elsql/pom.xml
+++ b/components/camel-elsql/pom.xml
@@ -114,4 +114,26 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>jdk9-build</id>
+      <activation>
+        <jdk>9</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
+              <argLine>--add-modules java.sql,java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED</argLine>
+              <!--https://issues.apache.org/jira/browse/SUREFIRE-1265 -->
+              <reuseForks>true</reuseForks>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>


[5/6] camel git commit: CAMEL-10141: make camel-sql unit tests pass on Java 9

Posted by da...@apache.org.
CAMEL-10141: make camel-sql unit tests pass 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/19011076
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19011076
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19011076

Branch: refs/heads/master
Commit: 19011076aab5789e6ebb54033eb6c9cef9e843f1
Parents: 16a6244
Author: jpoth <po...@gmail.com>
Authored: Tue Mar 14 16:17:35 2017 +0100
Committer: jpoth <po...@gmail.com>
Committed: Tue Mar 14 17:49:05 2017 +0100

----------------------------------------------------------------------
 components/camel-sql/pom.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/19011076/components/camel-sql/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-sql/pom.xml b/components/camel-sql/pom.xml
index afe68da..058dee4 100644
--- a/components/camel-sql/pom.xml
+++ b/components/camel-sql/pom.xml
@@ -136,4 +136,25 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>jdk9-build</id>
+      <activation>
+        <jdk>9</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
+              <argLine>--add-modules java.sql,java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED</argLine>
+              <!--https://issues.apache.org/jira/browse/SUREFIRE-1265 -->
+              <reuseForks>true</reuseForks>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>


[6/6] camel git commit: CAMEL-10141: make camel-bindy unit tests pass on Java 9

Posted by da...@apache.org.
CAMEL-10141: make camel-bindy unit tests pass 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/e9aec2b3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e9aec2b3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e9aec2b3

Branch: refs/heads/master
Commit: e9aec2b338db217047aaf9fd86c9f0b6b2620d3c
Parents: cad3c9c
Author: jpoth <po...@gmail.com>
Authored: Tue Mar 14 14:36:21 2017 +0100
Committer: jpoth <po...@gmail.com>
Committed: Tue Mar 14 17:49:05 2017 +0100

----------------------------------------------------------------------
 components/camel-bindy/pom.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e9aec2b3/components/camel-bindy/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index 6627a8c..f79249d 100755
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -89,4 +89,24 @@
         </dependency>
 
     </dependencies>
+
+    <profiles>
+        <profile>
+            <id>jdk9-build</id>
+            <activation>
+                <jdk>9</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
+                            <argLine>--add-modules java.xml.bind,java.xml.ws.annotation --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.xml.ws.annotation/javax.annotation=ALL-UNNAMED</argLine>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>


[3/6] camel git commit: CAMEL-10141: make camel-netty unit tests pass on Java 9

Posted by da...@apache.org.
CAMEL-10141: make camel-netty unit tests pass 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/65d79322
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/65d79322
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/65d79322

Branch: refs/heads/master
Commit: 65d7932282e99983717b1f5b9b661d2e19fc6e7e
Parents: 689d3c8
Author: jpoth <po...@gmail.com>
Authored: Tue Mar 14 14:35:36 2017 +0100
Committer: jpoth <po...@gmail.com>
Committed: Tue Mar 14 17:49:05 2017 +0100

----------------------------------------------------------------------
 components/camel-netty-http/pom.xml | 22 +++++++++++++++++++++-
 components/camel-netty4/pom.xml     | 20 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/65d79322/components/camel-netty-http/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml
index 16ada35..584edaa 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -104,5 +104,25 @@
       </plugin>
     </plugins>
   </build>
-
+    
+  <profiles>
+    <profile>
+        <id>jdk9-build</id>
+        <activation>
+            <jdk>9</jdk>
+        </activation>
+        <build>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
+                        <argLine>--add-modules java.xml.bind,java.xml.ws.annotation --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.xml.ws.annotation/javax.annotation=ALL-UNNAMED</argLine>
+                        <reuseForks>true</reuseForks>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </build>
+    </profile>
+   </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/camel/blob/65d79322/components/camel-netty4/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index ce83b0f..10cc9bf 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -78,5 +78,25 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+    
+  <profiles>
+      <profile>
+          <id>jdk9-build</id>
+          <activation>
+              <jdk>9</jdk>
+          </activation>
+          <build>
+              <plugins>
+                  <plugin>
+                      <artifactId>maven-surefire-plugin</artifactId>
+                      <configuration>
+                          <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
+                          <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED</argLine>
+                      </configuration>
+                  </plugin>
+              </plugins>
+          </build>
+      </profile>
+  </profiles>  
 
 </project>


[2/6] camel git commit: CAMEL-10141: move compile settings for Java 9 to camel-parent

Posted by da...@apache.org.
CAMEL-10141: move compile settings for Java 9 to camel-parent


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16a62442
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16a62442
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16a62442

Branch: refs/heads/master
Commit: 16a62442542f5706f4830d90caca3034dbe67847
Parents: e9aec2b
Author: jpoth <po...@gmail.com>
Authored: Tue Mar 14 14:36:56 2017 +0100
Committer: jpoth <po...@gmail.com>
Committed: Tue Mar 14 17:49:05 2017 +0100

----------------------------------------------------------------------
 camel-core/pom.xml | 16 ----------------
 parent/pom.xml     | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/16a62442/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 7f4b8e1..b9f6430 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -648,22 +648,6 @@
       <build>
         <plugins>
           <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>
-              <compilerArgs>
-                <arg>-J--add-modules</arg>
-                <arg>-Jjava.xml.bind</arg>
-              </compilerArgs>
-            </configuration>
-          </plugin>
-
-          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <!-- skip file stress tests as they are intended to run manually -->

http://git-wip-us.apache.org/repos/asf/camel/blob/16a62442/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0b7a154..fb6136a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5154,6 +5154,21 @@
                 </dependency>
               </dependencies>
             </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>
+                <compilerArgs>
+                  <arg>-J--add-modules</arg>
+                  <arg>-Jjava.xml.bind</arg>
+                </compilerArgs>
+              </configuration>
+            </plugin>
           </plugins>
         </pluginManagement>
       </build>


[4/6] camel git commit: CAMEL-10141: make camel-spring-boot unit tests pass on Java 9

Posted by da...@apache.org.
CAMEL-10141: make camel-spring-boot unit tests pass 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/cad3c9cd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cad3c9cd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cad3c9cd

Branch: refs/heads/master
Commit: cad3c9cd1f59f322097bec41ed3607efb3cc8a46
Parents: 65d7932
Author: jpoth <po...@gmail.com>
Authored: Tue Mar 14 14:36:04 2017 +0100
Committer: jpoth <po...@gmail.com>
Committed: Tue Mar 14 17:49:05 2017 +0100

----------------------------------------------------------------------
 components/camel-spring-boot/pom.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cad3c9cd/components/camel-spring-boot/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index cd3c452..f17f90f 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -123,4 +123,23 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>jdk9-build</id>
+      <activation>
+        <jdk>9</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
+              <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>