Repository: camel Updated Branches: refs/heads/master e09e5239f -> 4553bb6f8
Upgrade maven-surefire-plugin which fixes SUREFIRE-1265 on JDK9 GA Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b354ebbb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b354ebbb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b354ebbb Branch: refs/heads/master Commit: b354ebbbfaeefeca49a05e02a4b1e59e2fcdfe90 Parents: e09e523 Author: jpoth <poth.j...@gmail.com> Authored: Fri Sep 29 12:56:46 2017 +0200 Committer: jpoth <poth.j...@gmail.com> Committed: Fri Sep 29 12:56:46 2017 +0200 ---------------------------------------------------------------------- components/camel-elsql/pom.xml | 22 ---------------------- components/camel-soap/pom.xml | 8 -------- components/camel-spring-cloud-netflix/pom.xml | 21 --------------------- components/camel-spring-cloud/pom.xml | 21 --------------------- components/camel-sql/pom.xml | 22 ---------------------- parent/pom.xml | 2 -- pom.xml | 2 +- 7 files changed, 1 insertion(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b354ebbb/components/camel-elsql/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-elsql/pom.xml b/components/camel-elsql/pom.xml index a736f20..0786ce1 100644 --- a/components/camel-elsql/pom.xml +++ b/components/camel-elsql/pom.xml @@ -116,26 +116,4 @@ </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> http://git-wip-us.apache.org/repos/asf/camel/blob/b354ebbb/components/camel-soap/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml index 095f170..637ae93 100644 --- a/components/camel-soap/pom.xml +++ b/components/camel-soap/pom.xml @@ -292,14 +292,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>--add-modules java.xml.bind,java.xml.ws --add-opens java.base/java.lang=ALL-UNNAMED</argLine> - <!--https://issues.apache.org/jira/browse/SUREFIRE-1265 --> - <reuseForks>true</reuseForks> - </configuration> - </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/camel/blob/b354ebbb/components/camel-spring-cloud-netflix/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud-netflix/pom.xml b/components/camel-spring-cloud-netflix/pom.xml index cc10d14..bd83956 100644 --- a/components/camel-spring-cloud-netflix/pom.xml +++ b/components/camel-spring-cloud-netflix/pom.xml @@ -135,25 +135,4 @@ </plugin> </plugins> </build> - - <profiles> - <profile> - <id>jdk9-build</id> - <activation> - <jdk>9</jdk> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine> - <!--https://issues.apache.org/jira/browse/SUREFIRE-1265 --> - <reuseForks>true</reuseForks> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/b354ebbb/components/camel-spring-cloud/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-cloud/pom.xml b/components/camel-spring-cloud/pom.xml index d9faf51..6f61bf6 100644 --- a/components/camel-spring-cloud/pom.xml +++ b/components/camel-spring-cloud/pom.xml @@ -131,25 +131,4 @@ </plugin> </plugins> </build> - - <profiles> - <profile> - <id>jdk9-build</id> - <activation> - <jdk>9</jdk> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine> - <!--https://issues.apache.org/jira/browse/SUREFIRE-1265 --> - <reuseForks>true</reuseForks> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/b354ebbb/components/camel-sql/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-sql/pom.xml b/components/camel-sql/pom.xml index df67355..f45339d 100644 --- a/components/camel-sql/pom.xml +++ b/components/camel-sql/pom.xml @@ -137,26 +137,4 @@ </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> http://git-wip-us.apache.org/repos/asf/camel/blob/b354ebbb/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index bff5568..87e4aba 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -5521,8 +5521,6 @@ <artifactId>maven-surefire-plugin</artifactId> <!--lets avoid polluting every pom.xml as these settings are almost always needed--> <configuration> - <!--https://issues.apache.org/jira/browse/SUREFIRE-1265--> - <reuseForks>true</reuseForks> <argLine>${camel.surefire.fork.vmargs}</argLine> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/camel/blob/b354ebbb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 34a571c..f1ddf31 100755 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ <compiler.fork>false</compiler.fork> <maven-compiler-plugin-version>3.6.1</maven-compiler-plugin-version> - <maven-surefire-plugin-version>2.20</maven-surefire-plugin-version> + <maven-surefire-plugin-version>2.20.1</maven-surefire-plugin-version> <!-- eclipse plugin need the jaxb in this pom.xml file --> <!-- Make sure to keep JAXB version up to date in parent/pom.xml in the bottom of the file -->
