Enable tests that now pass 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/4553bb6f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4553bb6f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4553bb6f Branch: refs/heads/master Commit: 4553bb6f8fc04e6b9f9c0397790eb020d28011fd Parents: b354ebb Author: jpoth <poth.j...@gmail.com> Authored: Fri Sep 29 13:03:57 2017 +0200 Committer: jpoth <poth.j...@gmail.com> Committed: Fri Sep 29 13:03:57 2017 +0200 ---------------------------------------------------------------------- components/camel-cxf/pom.xml | 2 +- components/camel-jcr/pom.xml | 22 ------------ components/camel-opentracing/pom.xml | 38 +------------------- components/camel-script/pom.xml | 24 ------------- examples/camel-example-cdi-xml/pom.xml | 22 ------------ examples/camel-example-cxf/pom.xml | 2 +- .../pom.xml | 2 +- tests/camel-blueprint-cxf-test/pom.xml | 2 +- 8 files changed, 5 insertions(+), 109 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/components/camel-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml index 44bd26a..2a92745 100644 --- a/components/camel-cxf/pom.xml +++ b/components/camel-cxf/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/components/camel-jcr/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jcr/pom.xml b/components/camel-jcr/pom.xml index a19bfdc..f087837 100644 --- a/components/camel-jcr/pom.xml +++ b/components/camel-jcr/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/components/camel-opentracing/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-opentracing/pom.xml b/components/camel-opentracing/pom.xml index 1fd5ffe..6265208 100644 --- a/components/camel-opentracing/pom.xml +++ b/components/camel-opentracing/pom.xml @@ -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> @@ -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> http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/components/camel-script/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml index cb71b11..91610f1 100644 --- a/components/camel-script/pom.xml +++ b/components/camel-script/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/examples/camel-example-cdi-xml/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-xml/pom.xml b/examples/camel-example-cdi-xml/pom.xml index 19664a3..3babec4 100755 --- a/examples/camel-example-cdi-xml/pom.xml +++ b/examples/camel-example-cdi-xml/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/examples/camel-example-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.xml index cb18f28..3df492b 100644 --- a/examples/camel-example-cxf/pom.xml +++ b/examples/camel-example-cxf/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/examples/camel-example-reportincident-wssecurity/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-reportincident-wssecurity/pom.xml b/examples/camel-example-reportincident-wssecurity/pom.xml index a28ef80..5d440ce 100644 --- a/examples/camel-example-reportincident-wssecurity/pom.xml +++ b/examples/camel-example-reportincident-wssecurity/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/tests/camel-blueprint-cxf-test/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml index 9cff630..bd3ce58 100644 --- a/tests/camel-blueprint-cxf-test/pom.xml +++ b/tests/camel-blueprint-cxf-test/pom.xml @@ -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>
