Upgrade to Camel Quarkus 3.2.0

quarkusio · Sep 1, 2023 · ab02d8b · ab02d8b
1 parent 21a5eae
commit ab02d8b
Show file tree

Hide file tree

Showing 12 changed files with 2,153 additions and 2,182 deletions.
diff --git a/generated-platform-project/quarkus-camel/bom/pom.xml b/generated-platform-project/quarkus-camel/bom/pom.xml
diff --git a/...oject/quarkus-camel/integration-tests/camel-quarkus-integration-test-aws2-grouped/pom.xml b/...oject/quarkus-camel/integration-tests/camel-quarkus-integration-test-aws2-grouped/pom.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>htmlunit-driver</artifactId>
-      <version>4.10.0</version>
+      <version>4.11.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/...amel/integration-tests/camel-quarkus-integration-test-aws2-quarkus-client-grouped/pom.xml b/...amel/integration-tests/camel-quarkus-integration-test-aws2-quarkus-client-grouped/pom.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>htmlunit-driver</artifactId>
-      <version>4.10.0</version>
+      <version>4.11.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/...t/quarkus-camel/integration-tests/camel-quarkus-integration-test-cxf-soap-grouped/pom.xml b/...t/quarkus-camel/integration-tests/camel-quarkus-integration-test-cxf-soap-grouped/pom.xml
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.quarkiverse.cxf</groupId>
       <artifactId>quarkus-cxf-test-util</artifactId>
-      <version>${quarkus-google-cloud-services.version}</version>
+      <version>${quarkus-cxf.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...tform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-grpc/pom.xml b/...tform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-grpc/pom.xml
@@ -60,6 +60,11 @@
       <version>${camel-quarkus.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <pluginManagement>

diff --git a/...mel-quarkus-integration-test-jdbc/pom.xml → ...kus-integration-test-jdbc-grouped/pom.xml b/...mel-quarkus-integration-test-jdbc/pom.xml → ...kus-integration-test-jdbc-grouped/pom.xml
@@ -6,22 +6,29 @@
     <version>999-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>camel-quarkus-integration-test-jdbc</artifactId>
-  <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-jdbc</name>
+  <artifactId>camel-quarkus-integration-test-jdbc-grouped</artifactId>
+  <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-jdbc-grouped</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
-      <artifactId>camel-quarkus-integration-test-jdbc</artifactId>
+      <artifactId>camel-quarkus-integration-test-jdbc-grouped</artifactId>
       <version>${camel-quarkus.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
-      <artifactId>camel-quarkus-integration-test-jdbc</artifactId>
+      <artifactId>camel-quarkus-integration-test-jdbc-grouped</artifactId>
       <version>${camel-quarkus.version}</version>
       <type>test-jar</type>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel.quarkus</groupId>
+      <artifactId>camel-quarkus-integration-tests-support-jdbc</artifactId>
+      <version>${camel-quarkus.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>
@@ -88,7 +95,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <dependenciesToScan>
-            <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-jdbc</dependency>
+            <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-jdbc-grouped</dependency>
           </dependenciesToScan>
         </configuration>
       </plugin>
@@ -121,7 +128,7 @@
             </executions>
             <configuration>
               <dependenciesToScan>
-                <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-jdbc</dependency>
+                <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-jdbc-grouped</dependency>
               </dependenciesToScan>
             </configuration>
           </plugin>
@@ -136,7 +143,7 @@
                   <goal>build</goal>
                 </goals>
                 <configuration>
-                  <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-jdbc:${camel-quarkus.version}</appArtifact>
+                  <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-jdbc-grouped:${camel-quarkus.version}</appArtifact>
                 </configuration>
               </execution>
             </executions>

diff --git a/...ion-test-atlasmap/src/main/resources/seed → ...test-jdbc-grouped/src/main/resources/seed b/...ion-test-atlasmap/src/main/resources/seed → ...test-jdbc-grouped/src/main/resources/seed
diff --git a/...quarkus-integration-test-atlasmap/pom.xml → ...arkus-integration-test-xslt-saxon/pom.xml b/...quarkus-integration-test-atlasmap/pom.xml → ...arkus-integration-test-xslt-saxon/pom.xml
@@ -6,17 +6,17 @@
     <version>999-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>camel-quarkus-integration-test-atlasmap</artifactId>
-  <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-atlasmap</name>
+  <artifactId>camel-quarkus-integration-test-xslt-saxon</artifactId>
+  <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-xslt-saxon</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
-      <artifactId>camel-quarkus-integration-test-atlasmap</artifactId>
+      <artifactId>camel-quarkus-integration-test-xslt-saxon</artifactId>
       <version>${camel-quarkus.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
-      <artifactId>camel-quarkus-integration-test-atlasmap</artifactId>
+      <artifactId>camel-quarkus-integration-test-xslt-saxon</artifactId>
       <version>${camel-quarkus.version}</version>
       <type>test-jar</type>
       <classifier>tests</classifier>
@@ -83,7 +83,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <dependenciesToScan>
-            <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-atlasmap</dependency>
+            <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-xslt-saxon</dependency>
           </dependenciesToScan>
         </configuration>
       </plugin>
@@ -116,7 +116,7 @@
             </executions>
             <configuration>
               <dependenciesToScan>
-                <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-atlasmap</dependency>
+                <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-xslt-saxon</dependency>
               </dependenciesToScan>
             </configuration>
           </plugin>
@@ -131,7 +131,7 @@
                   <goal>build</goal>
                 </goals>
                 <configuration>
-                  <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-atlasmap:${camel-quarkus.version}</appArtifact>
+                  <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-xslt-saxon:${camel-quarkus.version}</appArtifact>
                 </configuration>
               </execution>
             </executions>

diff --git a/...gration-test-jdbc/src/main/resources/seed → ...n-test-xslt-saxon/src/main/resources/seed b/...gration-test-jdbc/src/main/resources/seed → ...n-test-xslt-saxon/src/main/resources/seed
diff --git a/generated-platform-project/quarkus-camel/integration-tests/pom.xml b/generated-platform-project/quarkus-camel/integration-tests/pom.xml
@@ -19,7 +19,6 @@
     <module>camel-quarkus-integration-test-activemq</module>
     <module>camel-quarkus-integration-test-amqp</module>
     <module>camel-quarkus-integration-test-arangodb</module>
-    <module>camel-quarkus-integration-test-atlasmap</module>
     <module>camel-quarkus-integration-test-avro</module>
     <module>camel-quarkus-integration-test-aws2-grouped</module>
     <module>camel-quarkus-integration-test-aws2-quarkus-client-grouped</module>
@@ -78,7 +77,7 @@
     <module>camel-quarkus-integration-test-java-joor-dsl</module>
     <module>camel-quarkus-integration-test-jaxb</module>
     <module>camel-quarkus-integration-test-jcache</module>
-    <module>camel-quarkus-integration-test-jdbc</module>
+    <module>camel-quarkus-integration-test-jdbc-grouped</module>
     <module>camel-quarkus-integration-test-jfr</module>
     <module>camel-quarkus-integration-test-jira</module>
     <module>camel-quarkus-integration-test-jms-artemis-client</module>
@@ -193,6 +192,7 @@
     <module>camel-quarkus-integration-test-xml-grouped</module>
     <module>camel-quarkus-integration-test-xmlsecurity</module>
     <module>camel-quarkus-integration-test-xpath</module>
+    <module>camel-quarkus-integration-test-xslt-saxon</module>
     <module>camel-quarkus-integration-test-zendesk</module>
   </modules>
   <properties>