Upgrade Quarkus to 2.5.0.CR1

docs/antora.yml

@@ -27,7 +27,7 @@ asciidoc:
     min-maven-version: 3.6.2 # replace ${min-maven-version}
     target-maven-version: 3.8.1 # replace ${target-maven-version}
     camel-version: 3.12.0 # replace ${camel.version}
-    quarkus-version: 2.4.0.Final # replace ${quarkus.version}
+    quarkus-version: 2.5.0.CR1 # replace ${quarkus.version}
     # attributes used in xrefs to other Antora components
     cq-camel-components: 3.12.x@components # replace ${camel.docs.components.xref}
     quarkus-examples-version: latest

extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java

@@ -53,7 +53,7 @@ public void accept(BuildChainBuilder builder) {
                     public void execute(BuildContext context) {
                         String methodName = "execute";
                         BytecodeRecorderImpl bri = new BytecodeRecorderImpl(true, getClass().getSimpleName(), methodName,
-                                Integer.toString(methodName.hashCode()), true);
+                                Integer.toString(methodName.hashCode()), true, s -> null);
                         RuntimeValue<CamelContextCustomizer> value = bri
                                 .newInstance(RestConfigurationCustomizer.class.getName());
                         context.produce(new CamelContextCustomizerBuildItem(value));

extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java

@@ -35,5 +35,6 @@ void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> r
         runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem("org.drools.core.util.Drools$XSTreamChekcer"));
         runtimeInitializedClass
                 .produce(new RuntimeInitializedClassBuildItem("org.drools.compiler.kproject.models.KieModuleMarshaller"));
+        runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem("org.drools.core.rule.JavaDialectRuntimeData"));
     }
 }

integration-tests-support/azure/pom.xml

@@ -41,6 +41,12 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains</groupId>
+                    <artifactId>annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>

integration-tests/fop/src/main/java/org/apache/camel/quarkus/component/fop/it/FopResource.java

@@ -16,7 +16,6 @@
  */
 package org.apache.camel.quarkus.component.fop.it;
 
-import java.io.InputStream;
 import java.net.URI;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -52,14 +51,11 @@ public class FopResource {
     public Response post(String message, @QueryParam("userConfigURL") String userConfigURL) throws Exception {
         LOG.infof("Sending to fop: %s", message);
         String endpointUri = userConfigURL == null ? "fop:pdf" : "fop:application/pdf?userConfigURL=" + userConfigURL;
-        try (InputStream response = producerTemplate.requestBody(
-                endpointUri, message, InputStream.class)) {
-            LOG.info("Got response from fop.");
-            return Response
-                    .created(new URI("https://camel.apache.org/"))
-                    .entity(response)
-                    .build();
-        }
-
+        byte[] bytes = producerTemplate.requestBody(endpointUri, message, byte[].class);
+        LOG.info("Got response from fop.");
+        return Response
+                .created(new URI("https://camel.apache.org/"))
+                .entity(bytes)
+                .build();
     }
 }

integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java

@@ -128,6 +128,15 @@ public String getBootstrapServers() {
             return String.format("SASL_SSL://%s:%s", getHost(), getMappedPort(KAFKA_PORT));
         }
 
+        @Override
+        protected void configure() {
+            super.configure();
+
+            String host = getNetwork() != null ? getNetworkAliases().get(0) : "localhost";
+            withEnv("KAFKA_ADVERTISED_LISTENERS",
+                    String.format("SASL_SSL://%s:9093,BROKER://%s:9092", host, host));
+        }
+
         @Override
         protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
             super.containerIsStarting(containerInfo, reused);

integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java

@@ -83,7 +83,7 @@ static final class SaslKafkaContainer extends KafkaContainer {
         SaslKafkaContainer(final DockerImageName dockerImageName) {
             super(dockerImageName);
 
-            String protocolMap = "SASL_PLAINTEXT:SASL_PLAINTEXT,BROKER:SASL_PLAINTEXT";
+            String protocolMap = "SASL_PLAINTEXT:SASL_PLAINTEXT,BROKER:PLAINTEXT";
             String listeners = "SASL_PLAINTEXT://0.0.0.0:" + KAFKA_PORT + ",BROKER://0.0.0.0:9092";
 
             withEnv("KAFKA_OPTS", "-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf");
@@ -102,6 +102,15 @@ public String getBootstrapServers() {
             return String.format("SASL_PLAINTEXT://%s:%s", getHost(), getMappedPort(KAFKA_PORT));
         }
 
+        @Override
+        protected void configure() {
+            super.configure();
+
+            String host = getNetwork() != null ? getNetworkAliases().get(0) : "localhost";
+            withEnv("KAFKA_ADVERTISED_LISTENERS",
+                    String.format("SASL_PLAINTEXT://%s:9093,BROKER://%s:9092", host, host));
+        }
+
         @Override
         protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
             super.containerIsStarting(containerInfo, reused);

integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java

@@ -121,6 +121,15 @@ public String getBootstrapServers() {
             return String.format("SSL://%s:%s", getHost(), getMappedPort(KAFKA_PORT));
         }
 
+        @Override
+        protected void configure() {
+            super.configure();
+
+            String host = getNetwork() != null ? getNetworkAliases().get(0) : "localhost";
+            withEnv("KAFKA_ADVERTISED_LISTENERS",
+                    String.format("SSL://%s:9093,BROKER://%s:9092", host, host));
+        }
+
         @Override
         protected void containerIsStarting(InspectContainerResponse containerInfo, boolean reused) {
             super.containerIsStarting(containerInfo, reused);

integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java

@@ -74,12 +74,12 @@ public class SalesforceResource {
     @Path("/document/{id}")
     @GET
     @Produces(MediaType.APPLICATION_JSON)
-    public Object getDocument(@PathParam("id") String id) {
+    public String getDocument(@PathParam("id") String id) {
         return template.withBody(id)
                 .withHeader(SalesforceEndpointConfig.SOBJECT_EXT_ID_NAME, "Name")
                 .withHeader(SalesforceEndpointConfig.SOBJECT_NAME, "Document")
                 .to("salesforce:getSObjectWithId?rawPayload=true")
-                .request();
+                .request(String.class);
     }
 
     @Path("/account")

pom.xml

@@ -51,7 +51,7 @@
         <optaplanner.version>8.9.1.Final</optaplanner.version><!-- May go back to Camel's ${optaplanner-version} when they are in sync https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
         <quarkiverse.freemarker.version>0.3.0</quarkiverse.freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
         <quarkiverse-minio.version>2.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
-        <quarkus.version>2.4.0.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+        <quarkus.version>2.5.0.CR1</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
         <quarkus-hazelcast-client.version>2.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
         <quarkus-qpid-jms.version>0.29.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
 
@@ -60,7 +60,7 @@
         <ahc.version>${ahc-version}</ahc.version>
         <animal-sniffer.version>1.18</animal-sniffer.version>
         <antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others -->
-        <avro.version>1.10.2</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
+        <avro.version>1.11.0</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
         <aws-java-sdk.version>1.11.714</aws-java-sdk.version>
         <azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version>
         <bouncycastle.version>1.69</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk15on -->
@@ -81,8 +81,8 @@
         <google-native-image-support.version>0.8.0</google-native-image-support.version>
         <google-auth-library-credentials.version>0.22.2</google-auth-library-credentials.version><!-- @sync io.grpc:grpc-auth:${grpc.version} dep:com.google.auth:google-auth-library-credentials -->
         <guava.version>29.0-jre</guava.version>
-        <graalvm.version>21.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
-        <grpc.version>1.40.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+        <graalvm.version>21.3.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
+        <grpc.version>1.42.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
         <gson.version>2.8.6</gson.version><!-- @sync com.ibm.jsonata4java:JSONata4Java:${jsonata4java-version} dep:com.google.code.gson:gson -->
         <guice-servlet.version>4.0</guice-servlet.version><!-- Spark -->
         <hadoop3.version>${hadoop3-version}</hadoop3.version><!-- Spark -->
@@ -117,7 +117,7 @@
         <retrofit.version>2.5.0</retrofit.version>
         <saaj.impl.version>1.5.3</saaj.impl.version>
         <scala-2.12.version>2.12.15</scala-2.12.version><!-- Spark -->
-        <smallrye.reactive.messaging.camel.version>3.10.1</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
+        <smallrye.reactive.messaging.camel.version>3.11.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
         <spring.version>${spring5-version}</spring.version>
         <snakeyaml.version>${snakeyaml-version}</snakeyaml.version>
         <snappy.version>1.1.7.7</snappy.version><!-- Spark -->

poms/bom/pom.xml

@@ -1171,7 +1171,7 @@
                 <exclusions>
                     <exclusion>
                         <groupId>org.infinispan</groupId>
-                        <artifactId>infinispan-core</artifactId>
+                        <artifactId>*</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>