From 470f5dcce4abc1f45907fd132c08cf073b47bfe4 Mon Sep 17 00:00:00 2001
From: James Netherton <jamesnetherton@gmail.com>
Date: Thu, 7 Apr 2022 13:27:20 +0100
Subject: [PATCH] Enable tests fixed in Camel Quarkus 2.8.0

---
 .../pom.xml                                   |  1 -
 .../pom.xml                                   |  4 ---
 .../pom.xml                                   |  4 ---
 .../pom.xml                                   |  4 ---
 .../pom.xml                                   |  4 ---
 .../quarkus-camel/integration-tests/pom.xml   | 10 +++----
 pom.xml                                       | 27 ++-----------------
 7 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-cassandraql/pom.xml b/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-cassandraql/pom.xml
index bf7a986dde..4ef0922cc1 100644
--- a/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-cassandraql/pom.xml
+++ b/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-cassandraql/pom.xml
@@ -116,7 +116,6 @@
             <quarkus.http.test-port>${test.http.port.jvm}</quarkus.http.test-port>
             <quarkus.http.test-ssl-port>${test.https.port.jvm}</quarkus.http.test-ssl-port>
             <quarkus.https.test-port>${test.https.port.jvm}</quarkus.https.test-port>
-            <quarkus.log.level>DEBUG</quarkus.log.level>
           </systemPropertyVariables>
         </configuration>
       </plugin>
diff --git a/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-http/pom.xml b/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-http/pom.xml
index cb3770c623..366a1de52d 100644
--- a/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-http/pom.xml
+++ b/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-http/pom.xml
@@ -8,9 +8,6 @@
   </parent>
   <artifactId>camel-quarkus-integration-test-http</artifactId>
   <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-http</name>
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
@@ -185,7 +182,6 @@
                   <goal>build</goal>
                 </goals>
                 <configuration>
-                  <skip>true</skip>
                   <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-http:${camel-quarkus.version}</appArtifact>
                 </configuration>
               </execution>
diff --git a/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-js-dsl/pom.xml b/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-js-dsl/pom.xml
index 3ab2ea1e54..41590f7399 100644
--- a/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-js-dsl/pom.xml
+++ b/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-js-dsl/pom.xml
@@ -8,9 +8,6 @@
   </parent>
   <artifactId>camel-quarkus-integration-test-js-dsl</artifactId>
   <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-js-dsl</name>
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
@@ -169,7 +166,6 @@
                   <goal>build</goal>
                 </goals>
                 <configuration>
-                  <skip>true</skip>
                   <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-js-dsl:${camel-quarkus.version}</appArtifact>
                 </configuration>
               </execution>
diff --git a/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-microprofile/pom.xml b/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-microprofile/pom.xml
index 9846a633dc..aeeebd80f0 100644
--- a/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-microprofile/pom.xml
+++ b/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-microprofile/pom.xml
@@ -8,9 +8,6 @@
   </parent>
   <artifactId>camel-quarkus-integration-test-microprofile</artifactId>
   <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-microprofile</name>
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
@@ -168,7 +165,6 @@
                   <goal>build</goal>
                 </goals>
                 <configuration>
-                  <skip>true</skip>
                   <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-microprofile:${camel-quarkus.version}</appArtifact>
                 </configuration>
               </execution>
diff --git a/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-opentelemetry/pom.xml b/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-opentelemetry/pom.xml
index 49bb394abd..236dc5c244 100644
--- a/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-opentelemetry/pom.xml
+++ b/generated-platform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-opentelemetry/pom.xml
@@ -8,9 +8,6 @@
   </parent>
   <artifactId>camel-quarkus-integration-test-opentelemetry</artifactId>
   <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-opentelemetry</name>
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
@@ -163,7 +160,6 @@
                   <goal>build</goal>
                 </goals>
                 <configuration>
-                  <skip>true</skip>
                   <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-opentelemetry:${camel-quarkus.version}</appArtifact>
                 </configuration>
               </execution>
diff --git a/generated-platform-project/quarkus-camel/integration-tests/pom.xml b/generated-platform-project/quarkus-camel/integration-tests/pom.xml
index fd68ec928b..bac18f71a4 100644
--- a/generated-platform-project/quarkus-camel/integration-tests/pom.xml
+++ b/generated-platform-project/quarkus-camel/integration-tests/pom.xml
@@ -12,12 +12,8 @@
   <packaging>pom</packaging>
   <name>Quarkus Platform - Camel - Integration Tests - Parent</name>
   <modules>
-    <module>camel-quarkus-integration-test-http</module>
-    <module>camel-quarkus-integration-test-js-dsl</module>
-    <module>camel-quarkus-integration-test-kafka-oauth</module>
-    <module>camel-quarkus-integration-test-microprofile</module>
     <module>camel-quarkus-integration-test-cassandraql</module>
-    <module>camel-quarkus-integration-test-opentelemetry</module>
+    <module>camel-quarkus-integration-test-kafka-oauth</module>
     <module>camel-quarkus-integration-test-file</module>
     <module>camel-quarkus-integration-test-activemq</module>
     <module>camel-quarkus-integration-test-amqp</module>
@@ -72,6 +68,7 @@
     <module>camel-quarkus-integration-test-hazelcast</module>
     <module>camel-quarkus-integration-test-headersmap</module>
     <module>camel-quarkus-integration-test-hl7</module>
+    <module>camel-quarkus-integration-test-http</module>
     <module>camel-quarkus-integration-test-hystrix</module>
     <module>camel-quarkus-integration-test-infinispan</module>
     <module>camel-quarkus-integration-test-influxdb</module>
@@ -86,6 +83,7 @@
     <module>camel-quarkus-integration-test-jms-qpid-amqp-client</module>
     <module>camel-quarkus-integration-test-jolt</module>
     <module>camel-quarkus-integration-test-jpa</module>
+    <module>camel-quarkus-integration-test-js-dsl</module>
     <module>camel-quarkus-integration-test-jsch</module>
     <module>camel-quarkus-integration-test-jslt</module>
     <module>camel-quarkus-integration-test-json-validator</module>
@@ -113,6 +111,7 @@
     <module>camel-quarkus-integration-test-main-yaml</module>
     <module>camel-quarkus-integration-test-main</module>
     <module>camel-quarkus-integration-test-micrometer</module>
+    <module>camel-quarkus-integration-test-microprofile</module>
     <module>camel-quarkus-integration-test-minio</module>
     <module>camel-quarkus-integration-test-mllp</module>
     <module>camel-quarkus-integration-test-mongodb-grouped</module>
@@ -128,6 +127,7 @@
     <module>camel-quarkus-integration-test-olingo4</module>
     <module>camel-quarkus-integration-test-openapi-java</module>
     <module>camel-quarkus-integration-test-openstack</module>
+    <module>camel-quarkus-integration-test-opentelemetry</module>
     <module>camel-quarkus-integration-test-opentracing</module>
     <module>camel-quarkus-integration-test-optaplanner</module>
     <module>camel-quarkus-integration-test-paho-mqtt5</module>
diff --git a/pom.xml b/pom.xml
index bca55490a0..801b5b2c99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -420,36 +420,13 @@
                                 </defaultTestConfig>
                                 <testCatalogArtifact>org.apache.camel.quarkus:camel-quarkus-test-list::xml:${camel-quarkus.version}</testCatalogArtifact>
                                 <tests>
-                                    <test><!-- Workaround for http tests failing with Quarkus 999-SNAPSHOT and CQ 2.7.0  -->
-                                        <skip>true</skip>
-                                        <artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-http:${camel-quarkus.version}</artifact>
-                                    </test>
-                                    <test><!-- Workaround for js-dsl tests failing with Quarkus 999-SNAPSHOT and CQ 2.7.0  -->
-                                        <skip>true</skip>
-                                        <artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-js-dsl:${camel-quarkus.version}</artifact>
-                                    </test>
-                                    <test><!-- Workaround for weird issue with shared networking & keycloak container -->
-                                        <skip>true</skip>
-                                        <artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-kafka-oauth:${camel-quarkus.version}</artifact>
-                                    </test>
-                                    <test><!-- Workaround for MicroProfile tests failing with Quarkus 999-SNAPSHOT and CQ 2.7.0  -->
-                                        <skip>true</skip>
-                                        <artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-microprofile:${camel-quarkus.version}</artifact>
-                                    </test>
-                                    <test><!-- Workaround invalid camel-quarkus-test-list generated https://github.com/apache/camel-quarkus/issues/3618 -->
-                                        <excluded>true</excluded>
-                                        <artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-ipfs:${camel-quarkus.version}</artifact>
-                                    </test>
                                     <test><!-- Workaround cassandraql itests failing on quarkus-platform https://github.com/apache/camel-quarkus/issues/3621 -->
                                         <skip>true</skip>
                                         <artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-cassandraql:${camel-quarkus.version}</artifact>
-                                        <jvmSystemProperties>
-                                            <quarkus.log.level>DEBUG</quarkus.log.level>
-                                        </jvmSystemProperties>
                                     </test>
-                                    <test><!-- Workaround opentelemetry tests failing because of an incompatibility detected in the nightly SNAPSHOT build -->
+                                    <test><!-- Workaround for weird issue with shared networking & keycloak container -->
                                         <skip>true</skip>
-                                        <artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-opentelemetry:${camel-quarkus.version}</artifact>
+                                        <artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-kafka-oauth:${camel-quarkus.version}</artifact>
                                     </test>
                                     <test><!-- Workaround flaky file test https://github.com/apache/camel-quarkus/issues/3627 -->
                                         <skip>true</skip>