Upgrade Camel to 4.8.0

.mvn/rrf/groupId-atlassian.txt

@@ -2,6 +2,8 @@ com.atlassian.event
 com.atlassian.httpclient
 com.atlassian.jira
 com.atlassian.platform
+com.atlassian.platform.dependencies
 com.atlassian.pom
+com.atlassian.plugins.rest
 com.atlassian.sal
 io.atlassian.fugue

docs/antora.yml

@@ -28,13 +28,13 @@ asciidoc:
     requires: "'util=camel-website-util,quarkus=xref:js/quarkus.js'"
 
     # Project versions
-    camel-version: 4.7.0 # replace ${camel.version}
+    camel-version: 4.8.0 # replace ${camel.version}
     camel-docs-version: next
     camel-quarkus-version: 3.15.0 # replace ${camel-quarkus.version}
     quarkus-version: 3.15.0.CR1 # replace ${quarkus.version}
     graalvm-version: 23.1.2 # replace ${graalvm.version}
     graalvm-docs-version: jdk21 # replace ${graalvm-docs.version}
-    mapstruct-version: 1.5.5.Final # replace ${mapstruct.version}
+    mapstruct-version: 1.6.0 # replace ${mapstruct.version}
     min-maven-version: 3.8.2 # replace ${min-maven-version}
     target-maven-version: 3.9.8 # replace ${target-maven-version}
 

docs/modules/ROOT/examples/components/guava-eventbus.yml

@@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-guava-eventbus
 cqArtifactIdBase: guava-eventbus
 cqNativeSupported: false
 cqStatus: Preview
-cqDeprecated: false
+cqDeprecated: true
 cqJvmSince: 1.1.0
 cqNativeSince: n/a
 cqCamelPartName: guava-eventbus

docs/modules/ROOT/examples/components/langchain4j-chat.yml

@@ -8,6 +8,6 @@ cqDeprecated: false
 cqJvmSince: 3.11.0
 cqNativeSince: 3.12.0
 cqCamelPartName: langchain4j-chat
-cqCamelPartTitle: langChain4j Chat
+cqCamelPartTitle: LangChain4j Chat
 cqCamelPartDescription: LangChain4j Chat component
 cqExtensionPageTitle: langChain4j Chat

docs/modules/ROOT/pages/reference/extensions/guava-eventbus.adoc

@@ -6,15 +6,15 @@
 :cq-artifact-id: camel-quarkus-guava-eventbus
 :cq-native-supported: false
 :cq-status: Preview
-:cq-status-deprecation: Preview
+:cq-status-deprecation: Preview Deprecated
 :cq-description: Send and receive messages to/from Guava EventBus.
-:cq-deprecated: false
+:cq-deprecated: true
 :cq-jvm-since: 1.1.0
 :cq-native-since: n/a
 
 ifeval::[{doc-show-badges} == true]
 [.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated##
 endif::[]
 
 Send and receive messages to/from Guava EventBus.

docs/modules/ROOT/pages/reference/extensions/langchain4j-chat.adoc

@@ -22,7 +22,7 @@ LangChain4j Chat component
 [id="extensions-langchain4j-chat-whats-inside"]
 == What's inside
 
-* xref:{cq-camel-components}::langchain4j-chat-component.adoc[langChain4j Chat component], URI syntax: `langchain4j-chat:chatId`
+* xref:{cq-camel-components}::langchain4j-chat-component.adoc[LangChain4j Chat component], URI syntax: `langchain4j-chat:chatId`
 
 Please refer to the above link for usage and configuration details.
 

extensions-jvm/flink/runtime/pom.xml

@@ -51,13 +51,23 @@
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <configuration>
-                    <!--Flink
-                    uses Inverted Class Loading which causing issue for the Quarkus classloading
-                    mechanism -->
+                    <!--Flink uses inverted Class Loading which causing issues for the Quarkus classloading -->
                     <parentFirstArtifacts>
+                        <parentFirstArtifact>org.apache.flink:flink-annotations</parentFirstArtifact>
+                        <parentFirstArtifact>org.apache.flink:flink-clients</parentFirstArtifact>
+                        <parentFirstArtifact>org.apache.flink:flink-connector-datagen</parentFirstArtifact>
                         <parentFirstArtifact>org.apache.flink:flink-core</parentFirstArtifact>
+                        <parentFirstArtifact>org.apache.flink:flink-datastream</parentFirstArtifact>
+                        <parentFirstArtifact>org.apache.flink:flink-datastream-api</parentFirstArtifact>
+                        <parentFirstArtifact>org.apache.flink:flink-file-sink-common</parentFirstArtifact>
+                        <parentFirstArtifact>org.apache.flink:flink-hadoop-fs</parentFirstArtifact>
+                        <parentFirstArtifact>org.apache.flink:flink-java</parentFirstArtifact>
+                        <parentFirstArtifact>org.apache.flink:flink-optimizer</parentFirstArtifact>
+                        <parentFirstArtifact>org.apache.flink:flink-queryable-state-client-java</parentFirstArtifact>
+                        <parentFirstArtifact>org.apache.flink:rpc-akka-loader</parentFirstArtifact>
                         <parentFirstArtifact>org.apache.flink:flink-rpc-core</parentFirstArtifact>
                         <parentFirstArtifact>org.apache.flink:flink-runtime</parentFirstArtifact>
+                        <parentFirstArtifact>org.apache.flink:flink-streaming-java</parentFirstArtifact>
                     </parentFirstArtifacts>
                 </configuration>
             </plugin>

extensions-jvm/guava-eventbus/runtime/src/main/resources/META-INF/quarkus-extension.yaml

@@ -31,3 +31,4 @@ metadata:
   - "integration"
   status:
   - "preview"
+  - "deprecated"

extensions/google-pubsub/runtime/src/main/java/org/apache/camel/quarkus/component/google/pubsub/graalvm/GaxGrpcSubstitutions.java

@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
+import java.time.Duration;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 
@@ -39,7 +40,6 @@
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.MethodDescriptor;
-import org.threeten.bp.Duration;
 
 /**
  * Cut out unsupported and optional features that are only present in grpc-alts.

integration-test-groups/mongodb/mongodb-gridfs/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsIT.java

@@ -17,9 +17,7 @@
 package org.apache.camel.quarkus.component.mongodb.gridfs.it;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6341")
 @QuarkusIntegrationTest
 class MongodbGridfsIT extends MongodbGridfsTest {
 }

integration-test-groups/mongodb/mongodb-gridfs/src/test/java/org/apache/camel/quarkus/component/mongodb/gridfs/it/MongodbGridfsTest.java

@@ -22,13 +22,11 @@
 import io.restassured.http.ContentType;
 import org.apache.camel.quarkus.test.support.mongodb.MongoDbTestResource;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.hamcrest.Matchers.is;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6341")
 @QuarkusTest
 @QuarkusTestResource(MongoDbTestResource.class)
 class MongodbGridfsTest {

integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbIT.java

@@ -17,9 +17,7 @@
 package org.apache.camel.quarkus.component.mongodb.it;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6341")
 @QuarkusIntegrationTest
 class MongoDbIT extends MongoDbTest {
 

integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java

@@ -39,7 +39,6 @@
 import org.jboss.logging.Logger;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -51,7 +50,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6341")
 @QuarkusTest
 @QuarkusTestResource(MongoDbTestResource.class)
 class MongoDbTest {

integration-tests/as2/src/main/java/org/apache/camel/quarkus/component/as2/it/transport/Request.java

@@ -115,19 +115,19 @@ public Map<String, Object> collectHeaders() {
         if (getMessageStructure() != null) {
             retVal.put(getMessageStructureKey(), getMessageStructure());
         }
-        retVal.put("CamelAS2.ediMessageContentType",
+        retVal.put("CamelAs2.ediMessageContentType",
                 ContentType.create(AS2MediaType.APPLICATION_EDIFACT, StandardCharsets.US_ASCII.name()));
         if (getEncryptionAlgorithm() != null) {
-            retVal.put("CamelAS2.encryptingCertificateChain", As2CertificateHelper.getCertList());
-            retVal.put("CamelAS2.encryptingAlgorithm", getEncryptionAlgorithm());
+            retVal.put("CamelAs2.encryptingCertificateChain", As2CertificateHelper.getCertList());
+            retVal.put("CamelAs2.encryptingAlgorithm", getEncryptionAlgorithm());
         }
         if (getSigningAlgorithm() != null) {
             // parameter type is java.security.cert.Certificate[]
-            retVal.put("CamelAS2.signingCertificateChain", As2CertificateHelper.getCertList().toArray(new Certificate[0]));
+            retVal.put("CamelAs2.signingCertificateChain", As2CertificateHelper.getCertList().toArray(new Certificate[0]));
             // parameter type is java.security.PrivateKey
-            retVal.put("CamelAS2.signingPrivateKey", As2CertificateHelper.getSigningKP().getPrivate());
+            retVal.put("CamelAs2.signingPrivateKey", As2CertificateHelper.getSigningKP().getPrivate());
             // parameter type is org.apache.camel.component.as2.api.AS2SignatureAlgorithm
-            retVal.put("CamelAS2.signingAlgorithm", getSigningAlgorithm());
+            retVal.put("CamelAs2.signingAlgorithm", getSigningAlgorithm());
         }
         return retVal;
     }

integration-tests/as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2Helper.java

@@ -88,7 +88,7 @@ public static Request createEncryptedRequest() {
     public static Request createMultipartSignedRequest() {
         final Map<String, Object> headers = createBaseHeaders(AS2MessageStructure.SIGNED);
         // parameter type is String[]
-        headers.put("CamelAS2.signedReceiptMicAlgorithms", SIGNED_RECEIPT_MIC_ALGORITHMS);
+        headers.put("CamelAs2.signedReceiptMicAlgorithms", SIGNED_RECEIPT_MIC_ALGORITHMS);
 
         return new Request()
                 .withHeaders(headers)
@@ -99,24 +99,24 @@ public static Request createMultipartSignedRequest() {
     private static Map<String, Object> createBaseHeaders(AS2MessageStructure plain) {
         final Map<String, Object> headers = new HashMap<>();
         // parameter type is String
-        headers.put("CamelAS2.requestUri", REQUEST_URI);
+        headers.put("CamelAs2.requestUri", REQUEST_URI);
         // parameter type is String
-        headers.put("CamelAS2.subject", SUBJECT);
+        headers.put("CamelAs2.subject", SUBJECT);
         // parameter type is String
-        headers.put("CamelAS2.from", FROM);
+        headers.put("CamelAs2.from", FROM);
         // parameter type is String
-        headers.put("CamelAS2.as2From", AS2_NAME);
+        headers.put("CamelAs2.as2From", AS2_NAME);
         // parameter type is String
-        headers.put("CamelAS2.as2To", AS2_NAME);
+        headers.put("CamelAs2.as2To", AS2_NAME);
         // parameter type is org.apache.camel.component.as2.api.AS2MessageStructure
-        headers.put("CamelAS2.as2MessageStructure", plain);
+        headers.put("CamelAs2.as2MessageStructure", plain);
         // parameter type is org.apache.http.entity.ContentType
-        headers.put("CamelAS2.ediMessageContentType",
+        headers.put("CamelAs2.ediMessageContentType",
                 ContentType.create(AS2MediaType.APPLICATION_EDIFACT, StandardCharsets.US_ASCII.name()));
         // parameter type is String
-        headers.put("CamelAS2.ediMessageTransferEncoding", EDI_MESSAGE_CONTENT_TRANSFER_ENCODING);
+        headers.put("CamelAs2.ediMessageTransferEncoding", EDI_MESSAGE_CONTENT_TRANSFER_ENCODING);
         // parameter type is String
-        headers.put("CamelAS2.dispositionNotificationTo", DISPOSITION_NOTIFICATION_TO);
+        headers.put("CamelAs2.dispositionNotificationTo", DISPOSITION_NOTIFICATION_TO);
         return headers;
     }
 

integration-tests/debezium/pom.xml

@@ -128,7 +128,7 @@
 
 
     <profiles>
-        <!-- TODO: https://github.com/apache/camel-quarkus/issues/6341
+        <!-- TODO: https://github.com/apache/camel-quarkus/issues/6357
         <profile>
             <id>native</id>
             <activation>

integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbIT.java

@@ -19,7 +19,7 @@
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.junit.jupiter.api.Disabled;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/4638, https://github.com/apache/camel-quarkus/issues/6341")
+@Disabled("https://github.com/apache/camel-quarkus/issues/4638")
 @QuarkusIntegrationTest
 class DebeziumMongodbIT extends DebeziumMongodbTest {
 

integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java

@@ -48,7 +48,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6341")
+@Disabled("https://github.com/apache/camel-quarkus/issues/6357")
 @QuarkusTest
 @QuarkusTestResource(DebeziumMongodbTestResource.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)

integration-tests/kubernetes/pom.xml

@@ -81,7 +81,6 @@
                 <quarkus.native.native-image-xmx>6g</quarkus.native.native-image-xmx>
             </properties>
         </profile>
-        <!-- TODO: https://github.com/apache/camel-quarkus/issues/6348
         <profile>
             <id>native</id>
             <activation>
@@ -109,7 +108,6 @@
                 </plugins>
             </build>
         </profile>
-        -->
         <profile>
             <id>virtualDependencies</id>
             <activation>

integration-tests/master-openshift/pom.xml

@@ -176,7 +176,6 @@
                 </plugins>
             </build>
         </profile>
-        <!-- TODO: https://github.com/apache/camel-quarkus/issues/6348
          <profile>
              <id>native</id>
              <activation>
@@ -214,7 +213,6 @@
                  </plugins>
              </build>
          </profile>
-         -->
          <profile>
              <id>virtualDependencies</id>
              <activation>

integration-tests/microprofile-fault-tolerance/pom.xml

@@ -70,7 +70,6 @@
     </dependencies>
 
     <profiles>
-        <!-- TODO: https://github.com/apache/camel-quarkus/issues/6285
         <profile>
             <id>native</id>
             <activation>
@@ -98,7 +97,6 @@
                 </plugins>
             </build>
         </profile>
-        -->
         <profile>
             <id>virtualDependencies</id>
             <activation>

integration-tests/microprofile-fault-tolerance/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroProfileFaultToleranceConfigurationIT.java

@@ -17,9 +17,7 @@
 package org.apache.camel.quarkus.component.microprofile.it.faulttolerance;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6285")
 @QuarkusIntegrationTest
 class MicroProfileFaultToleranceConfigurationIT extends MicroProfileFaultToleranceConfigurationTest {
 }

integration-tests/microprofile-fault-tolerance/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroProfileFaultToleranceConfigurationTest.java

@@ -19,12 +19,10 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
 import io.restassured.RestAssured;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.is;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6285")
 @QuarkusTest
 @TestProfile(MicroProfileFaultToleranceConfigurationTestProfile.class)
 class MicroProfileFaultToleranceConfigurationTest {

integration-tests/microprofile-fault-tolerance/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceIT.java

@@ -17,9 +17,7 @@
 package org.apache.camel.quarkus.component.microprofile.it.faulttolerance;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6285")
 @QuarkusIntegrationTest
 class MicroprofileFaultToleranceIT extends MicroprofileFaultToleranceTest {
 

integration-tests/microprofile-fault-tolerance/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceTest.java

@@ -18,7 +18,6 @@
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -27,7 +26,6 @@
 import static org.apache.camel.quarkus.component.microprofile.it.faulttolerance.MicroProfileFaultToleranceRoutes.EXCEPTION_MESSAGE;
 import static org.hamcrest.Matchers.is;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6285")
 @QuarkusTest
 class MicroprofileFaultToleranceTest {
 

integration-tests/mongodb-grouped/pom.xml

@@ -103,7 +103,6 @@
     </build>
 
     <profiles>
-        <!-- TODO: https://github.com/apache/camel-quarkus/issues/6341
         <profile>
             <id>native</id>
             <activation>
@@ -131,7 +130,6 @@
                 </plugins>
             </build>
         </profile>
-        -->
         <profile>
             <id>virtualDependencies</id>
             <activation>

integration-tests/platform-http/src/main/java/org/apache/camel/quarkus/component/platform/http/it/PlatformHttpRouteBuilder.java

@@ -171,7 +171,7 @@ public void configure() {
                 .transform(body().prepend("Hello "));
 
         // Basic auth security tests
-        from("platform-http:/platform-http/secure/basic")
+        from("platform-http:/platform-http/secure/basic?returnHttpRequestHeaders=true")
                 .process(exchange -> {
                     Message message = exchange.getMessage();
                     QuarkusHttpUser user = message.getHeader(VertxPlatformHttpConstants.AUTHENTICATED_USER,