Skip to content

Commit

Permalink
Enable tests that now pass 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 b354ebb commit 4553bb6
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 109 deletions.
2 changes: 1 addition & 1 deletion components/camel-cxf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<!--ignore tests until CXF-7270 is resolved and released-->
<!--ignore tests until CXF-7520 is resolved and released-->
<exclude>**/**</exclude>
</excludes>
</configuration>
Expand Down
22 changes: 0 additions & 22 deletions components/camel-jcr/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,26 +110,4 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jdk9-build</id>
<activation>
<jdk>9</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<!--TODO: See https://issues.apache.org/jira/browse/JCR-4131 for more information. -->
<exclude>**/**.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
38 changes: 1 addition & 37 deletions components/camel-opentracing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
<configuration>
<argLine>
-javaagent:${opentracing-agent.lib}/opentracing-agent.jar
-Dorg.jboss.byteman.verbose
-Dorg.jboss.byteman.verbose ${camel.surefire.fork.vmargs}
</argLine>
</configuration>
<executions>
Expand All @@ -175,40 +175,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>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<id>run-integration-tests</id>
<goals>
<goal>integration-test</goal>
</goals>
<configuration>
<excludes>
<!--TODO: https://github.com/opentracing-contrib/java-agent/issues/18-->
<exclude>**/**.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
24 changes: 0 additions & 24 deletions components/camel-script/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,28 +146,4 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jdk9-build</id>
<activation>
<jdk>9</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<!-- TODO: Let's wait until Groovy and Ruby are supported on Java 9-->
<exclude>**/**Groovy**.java</exclude>
<exclude>**/**Ruby**.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
22 changes: 0 additions & 22 deletions examples/camel-example-cdi-xml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,26 +122,4 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jdk9-build</id>
<activation>
<jdk>9</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- need older version of surefire to make test work -->
<version>2.19.1</version>
<configuration>
<argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion examples/camel-example-cxf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<!--ignore tests until CXF-7270 is resolved and released-->
<!--ignore tests until CXF-7520 is resolved and released-->
<exclude>**/**</exclude>
</excludes>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-reportincident-wssecurity/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<!--ignore tests until CXF-7270 is resolved and released-->
<!--ignore tests until CXF-7520 is resolved and released-->
<exclude>**/**</exclude>
</excludes>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion tests/camel-blueprint-cxf-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<!--ignore tests until CXF-7270 is resolved and released-->
<!--ignore tests until CXF-7520 is resolved and released-->
<exclude>**/**</exclude>
</excludes>
</configuration>
Expand Down

0 comments on commit 4553bb6

Please sign in to comment.