Skip to content

Commit

Permalink
Upgrade maven-surefire-plugin which fixes SUREFIRE-1265 on JDK9 GA
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnpoth
johnpoth committed Sep 29, 2017
1 parent e09e523 commit b354ebb
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 97 deletions.
22 changes: 0 additions & 22 deletions components/camel-elsql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 0 additions & 8 deletions components/camel-soap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
21 changes: 0 additions & 21 deletions components/camel-spring-cloud-netflix/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
21 changes: 0 additions & 21 deletions components/camel-spring-cloud/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
22 changes: 0 additions & 22 deletions components/camel-sql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 0 additions & 2 deletions parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down

0 comments on commit b354ebb

Please sign in to comment.