Upgrade to Camel Quarkus 2.10.0

quarkusio · Jun 20, 2022 · 6cae32a · 6cae32a
1 parent 2a03681
commit 6cae32a
Show file tree

Hide file tree

Showing 17 changed files with 2,748 additions and 3,926 deletions.
diff --git a/generated-platform-project/quarkus-camel/bom/pom.xml b/generated-platform-project/quarkus-camel/bom/pom.xml
diff --git a/...amel-quarkus-integration-test-msv/pom.xml → ...egration-test-compression-grouped/pom.xml b/...amel-quarkus-integration-test-msv/pom.xml → ...egration-test-compression-grouped/pom.xml
@@ -6,27 +6,22 @@
     <version>999-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>camel-quarkus-integration-test-msv</artifactId>
-  <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-msv</name>
+  <artifactId>camel-quarkus-integration-test-compression-grouped</artifactId>
+  <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-compression-grouped</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
-      <artifactId>camel-quarkus-integration-test-msv</artifactId>
+      <artifactId>camel-quarkus-integration-test-compression-grouped</artifactId>
       <version>${camel-quarkus.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
-      <artifactId>camel-quarkus-integration-test-msv</artifactId>
+      <artifactId>camel-quarkus-integration-test-compression-grouped</artifactId>
       <version>${camel-quarkus.version}</version>
       <type>test-jar</type>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>io.rest-assured</groupId>
       <artifactId>rest-assured</artifactId>
@@ -54,6 +49,11 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <pluginManagement>
@@ -83,7 +83,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <dependenciesToScan>
-            <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-msv</dependency>
+            <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-compression-grouped</dependency>
           </dependenciesToScan>
           <systemPropertyVariables>
             <quarkus.http.test-port>${test.http.port.jvm}</quarkus.http.test-port>
@@ -145,7 +145,7 @@
             </executions>
             <configuration>
               <dependenciesToScan>
-                <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-msv</dependency>
+                <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-compression-grouped</dependency>
               </dependenciesToScan>
             </configuration>
           </plugin>
@@ -160,7 +160,7 @@
                   <goal>build</goal>
                 </goals>
                 <configuration>
-                  <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-msv:${camel-quarkus.version}</appArtifact>
+                  <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-compression-grouped:${camel-quarkus.version}</appArtifact>
                 </configuration>
               </execution>
             </executions>

diff --git a/...-test-compression/src/main/resources/seed → ...mpression-grouped/src/main/resources/seed b/...-test-compression/src/main/resources/seed → ...mpression-grouped/src/main/resources/seed
diff --git a/...roject/quarkus-camel/integration-tests/camel-quarkus-integration-test-compression/pom.xml b/...roject/quarkus-camel/integration-tests/camel-quarkus-integration-test-compression/pom.xml
diff --git a/...mel-quarkus-integration-test-jing/pom.xml → ...arkus-integration-test-datasonnet/pom.xml b/...mel-quarkus-integration-test-jing/pom.xml → ...arkus-integration-test-datasonnet/pom.xml
@@ -6,17 +6,17 @@
     <version>999-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>camel-quarkus-integration-test-jing</artifactId>
-  <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-jing</name>
+  <artifactId>camel-quarkus-integration-test-datasonnet</artifactId>
+  <name>Quarkus Platform - Camel - Integration Tests - camel-quarkus-integration-test-datasonnet</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
-      <artifactId>camel-quarkus-integration-test-jing</artifactId>
+      <artifactId>camel-quarkus-integration-test-datasonnet</artifactId>
       <version>${camel-quarkus.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
-      <artifactId>camel-quarkus-integration-test-jing</artifactId>
+      <artifactId>camel-quarkus-integration-test-datasonnet</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-jing</dependency>
+            <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-datasonnet</dependency>
           </dependenciesToScan>
           <systemPropertyVariables>
             <quarkus.http.test-port>${test.http.port.jvm}</quarkus.http.test-port>
@@ -145,7 +145,7 @@
             </executions>
             <configuration>
               <dependenciesToScan>
-                <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-jing</dependency>
+                <dependency>org.apache.camel.quarkus:camel-quarkus-integration-test-datasonnet</dependency>
               </dependenciesToScan>
             </configuration>
           </plugin>
@@ -160,7 +160,7 @@
                   <goal>build</goal>
                 </goals>
                 <configuration>
-                  <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-jing:${camel-quarkus.version}</appArtifact>
+                  <appArtifact>org.apache.camel.quarkus:camel-quarkus-integration-test-datasonnet:${camel-quarkus.version}</appArtifact>
                 </configuration>
               </execution>
             </executions>

diff --git a/...tion-test-hystrix/src/main/resources/seed → ...n-test-datasonnet/src/main/resources/seed b/...tion-test-hystrix/src/main/resources/seed → ...n-test-datasonnet/src/main/resources/seed
diff --git a/...atform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-fop/pom.xml b/...atform-project/quarkus-camel/integration-tests/camel-quarkus-integration-test-fop/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
       <artifactId>pdfbox</artifactId>
-      <version>2.0.24</version>
+      <version>2.0.26</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>