Merge pull request #564 from jamesnetherton/enable-fixed-cq-tests

Enable Camel Quarkus tests fixed in 2.10.0
quarkusio · Jun 21, 2022 · fdc2094 · fdc2094
2 parents 133920a + a68c9d9
commit fdc2094
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 27 deletions.
diff --git a/...roject/quarkus-camel/integration-tests/camel-quarkus-integration-test-cassandraql/pom.xml b/...roject/quarkus-camel/integration-tests/camel-quarkus-integration-test-cassandraql/pom.xml
@@ -8,9 +8,6 @@
   </parent>
   <artifactId>camel-quarkus-integration-test-cassandraql</artifactId>
   <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-cassandraql</name>
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
@@ -197,7 +194,6 @@
                   <goal>build</goal>
                 </goals>
                 <configuration>
-                  <skip>true</skip>
                   <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-cassandraql:${camel-quarkus.version}</appArtifact>
                 </configuration>
               </execution>

diff --git a/...rm-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-csimple/pom.xml b/...rm-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-csimple/pom.xml
@@ -8,9 +8,6 @@
   </parent>
   <artifactId>camel-quarkus-integration-test-csimple</artifactId>
   <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-csimple</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-csimple:${camel-quarkus.version}</appArtifact>
                 </configuration>
               </execution>

diff --git a/...orm-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-js-dsl/pom.xml b/...orm-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>
@@ -168,7 +165,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/pom.xml b/generated-platform-project/quarkus-camel/integration-tests/pom.xml
@@ -12,12 +12,9 @@
   <packaging>pom</packaging>
   <name>Quarkus Platform - Camel - Integration Tests - Parent</name>
   <modules>
-    <module>camel-quarkus-integration-test-cassandraql</module>
-    <module>camel-quarkus-integration-test-csimple</module>
     <module>camel-quarkus-integration-test-kafka-oauth</module>
     <module>camel-quarkus-integration-test-file</module>
     <module>camel-quarkus-integration-test-debezium</module>
-    <module>camel-quarkus-integration-test-js-dsl</module>
     <module>camel-quarkus-integration-test-activemq</module>
     <module>camel-quarkus-integration-test-amqp</module>
     <module>camel-quarkus-integration-test-arangodb</module>
@@ -35,12 +32,14 @@
     <module>camel-quarkus-integration-test-box</module>
     <module>camel-quarkus-integration-test-braintree</module>
     <module>camel-quarkus-integration-test-caffeine</module>
+    <module>camel-quarkus-integration-test-cassandraql</module>
     <module>camel-quarkus-integration-test-cbor</module>
     <module>camel-quarkus-integration-test-compression-grouped</module>
     <module>camel-quarkus-integration-test-consul</module>
     <module>camel-quarkus-integration-test-core-discovery-disabled</module>
     <module>camel-quarkus-integration-test-couchdb</module>
     <module>camel-quarkus-integration-test-crypto</module>
+    <module>camel-quarkus-integration-test-csimple</module>
     <module>camel-quarkus-integration-test-csv</module>
     <module>camel-quarkus-integration-test-dataformat</module>
     <module>camel-quarkus-integration-test-dataformats-json</module>
@@ -83,6 +82,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>

diff --git a/pom.xml b/pom.xml
@@ -425,14 +425,6 @@
                                 </defaultTestConfig>
                                 <testCatalogArtifact>org.apache.camel.quarkus:camel-quarkus-test-list::xml:${camel-quarkus.version}</testCatalogArtifact>
                                 <tests>
-                                    <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>
-                                    </test>
-                                    <test><!-- Workaround for incompatibility with Quarkus 999-SNAPSHOT and CQ <= 2.9.0 -->
-                                        <skip>true</skip>
-                                        <artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-csimple:${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>
@@ -445,10 +437,6 @@
                                         <skip>true</skip>
                                         <artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-debezium:${camel-quarkus.version}</artifact>
                                     </test>
-                                    <test><!-- Workaround for Graal SDK incompatibility with Quarkus 999-SNAPSHOT and CQ <= 2.9.0 -->
-                                        <skip>true</skip>
-                                        <artifact>org.apache.camel.quarkus:camel-quarkus-integration-test-js-dsl:${camel-quarkus.version}</artifact>
-                                    </test>
                                 </tests>
                             </member>
                             <member>