From 4553bb6f8fc04e6b9f9c0397790eb020d28011fd Mon Sep 17 00:00:00 2001
From: jpoth <poth.john@gmail.com>
Date: Fri, 29 Sep 2017 13:03:57 +0200
Subject: [PATCH] Enable tests that now pass on JDK9 GA

---
 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(-)

diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 44bd26a7d2849..2a92745eee9ce 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>
diff --git a/components/camel-jcr/pom.xml b/components/camel-jcr/pom.xml
index a19bfdc2fe1e1..f08783784b828 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>
diff --git a/components/camel-opentracing/pom.xml b/components/camel-opentracing/pom.xml
index 1fd5ffe4951ee..626520889eea9 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>
diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml
index cb71b11326f0b..91610f1c1328f 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>
diff --git a/examples/camel-example-cdi-xml/pom.xml b/examples/camel-example-cdi-xml/pom.xml
index 19664a3ddd29f..3babec4462da6 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>
diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.xml
index cb18f282b7c75..3df492b6ce5c7 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>
diff --git a/examples/camel-example-reportincident-wssecurity/pom.xml b/examples/camel-example-reportincident-wssecurity/pom.xml
index a28ef805dfdd7..5d440ceff2cd2 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>
diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml
index 9cff630bf538f..bd3ce58c708fa 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>