From d28a35e48c5a90a8ff4da0a98c7932f19ee5befd Mon Sep 17 00:00:00 2001 From: James Netherton Date: Mon, 22 Jul 2024 07:39:35 +0100 Subject: [PATCH] Upgrade Quarkus to 3.13.0.CR1 --- docs/antora.yml | 4 ++-- .../hazelcast/deployment/HazelcastProcessor.java | 2 ++ ...sKafkaClientFactoryDisabledMergeConfigTest.java | 8 ++++---- ...afkaClientFactoryDisabledViaPropertiesTest.java | 8 ++++---- .../QuarkusKafkaClientFactoryEnabledTest.java | 8 ++++---- .../deployment/QuarkusKafkaClientFactoryTest.java | 8 ++++---- .../openapi/java/deployment/RESTOpenAPITest.java | 8 ++++---- .../kafka/oauth/it/KafkaKeycloakTestResource.java | 8 ++++---- pom.xml | 14 +++++++------- poms/bom/src/main/generated/flattened-full-pom.xml | 6 +++--- .../src/main/generated/flattened-reduced-pom.xml | 6 +++--- .../generated/flattened-reduced-verbose-pom.xml | 6 +++--- 12 files changed, 44 insertions(+), 42 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 5c85d48f1599..e7e91a26871d 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -31,12 +31,12 @@ asciidoc: camel-version: 4.7.0 # replace ${camel.version} camel-docs-version: next camel-quarkus-version: 3.13.0 # replace ${camel-quarkus.version} - quarkus-version: 3.12.0 # replace ${quarkus.version} + quarkus-version: 3.13.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} min-maven-version: 3.8.2 # replace ${min-maven-version} - target-maven-version: 3.9.7 # replace ${target-maven-version} + target-maven-version: 3.9.8 # replace ${target-maven-version} # Attributes used in xrefs to other Antora components cq-camel-components: next@components diff --git a/extensions/hazelcast/deployment/src/main/java/org/apache/camel/quarkus/component/hazelcast/deployment/HazelcastProcessor.java b/extensions/hazelcast/deployment/src/main/java/org/apache/camel/quarkus/component/hazelcast/deployment/HazelcastProcessor.java index 1b5458ac5d93..cdfb66e22daf 100644 --- a/extensions/hazelcast/deployment/src/main/java/org/apache/camel/quarkus/component/hazelcast/deployment/HazelcastProcessor.java +++ b/extensions/hazelcast/deployment/src/main/java/org/apache/camel/quarkus/component/hazelcast/deployment/HazelcastProcessor.java @@ -34,6 +34,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.cp.IAtomicLong; import com.hazelcast.internal.util.ICMPHelper; +import com.hazelcast.internal.util.OperatingSystemMXBeanSupport; import com.hazelcast.map.IMap; import com.hazelcast.multimap.MultiMap; import com.hazelcast.replicatedmap.ReplicatedMap; @@ -104,6 +105,7 @@ void registerICMPHelper(BuildProducer initiali if (OS.determineOS() != OS.LINUX) { initializedClasses.produce(new RuntimeInitializedClassBuildItem(ICMPHelper.class.getName())); } + initializedClasses.produce(new RuntimeInitializedClassBuildItem(OperatingSystemMXBeanSupport.class.getName())); } private static void registerTypeHierarchy( diff --git a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryDisabledMergeConfigTest.java b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryDisabledMergeConfigTest.java index 596131cfe1d5..81d77d1b4378 100644 --- a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryDisabledMergeConfigTest.java +++ b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryDisabledMergeConfigTest.java @@ -16,11 +16,11 @@ */ package org.apache.camel.quarkus.component.kafka.deployment; -import java.util.Arrays; +import java.util.List; import java.util.Set; -import io.quarkus.bootstrap.model.AppArtifact; import io.quarkus.builder.Version; +import io.quarkus.maven.dependency.Dependency; import io.quarkus.test.QuarkusUnitTest; import jakarta.inject.Inject; import org.apache.camel.CamelContext; @@ -36,8 +36,8 @@ public class QuarkusKafkaClientFactoryDisabledMergeConfigTest { @RegisterExtension static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() - .setForcedDependencies(Arrays.asList( - new AppArtifact("io.quarkus", "quarkus-kubernetes-service-binding", Version.getVersion()))) + .setForcedDependencies(List.of( + Dependency.of("io.quarkus", "quarkus-kubernetes-service-binding", Version.getVersion()))) .withConfigurationResource("application-configuration-merging-disabled.properties") .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); diff --git a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryDisabledViaPropertiesTest.java b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryDisabledViaPropertiesTest.java index 5816a0f17084..04d0b387328e 100644 --- a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryDisabledViaPropertiesTest.java +++ b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryDisabledViaPropertiesTest.java @@ -16,11 +16,11 @@ */ package org.apache.camel.quarkus.component.kafka.deployment; -import java.util.Arrays; +import java.util.List; import java.util.Set; -import io.quarkus.bootstrap.model.AppArtifact; import io.quarkus.builder.Version; +import io.quarkus.maven.dependency.Dependency; import io.quarkus.test.QuarkusUnitTest; import jakarta.inject.Inject; import org.apache.camel.CamelContext; @@ -37,8 +37,8 @@ public class QuarkusKafkaClientFactoryDisabledViaPropertiesTest { @RegisterExtension static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() .withConfigurationResource("application-configuration-disable-service-binding.properties") - .setForcedDependencies(Arrays.asList( - new AppArtifact("io.quarkus", "quarkus-kubernetes-service-binding", Version.getVersion()))) + .setForcedDependencies(List.of( + Dependency.of("io.quarkus", "quarkus-kubernetes-service-binding", Version.getVersion()))) .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); @Inject diff --git a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryEnabledTest.java b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryEnabledTest.java index fe15ebe74ce5..f129d3eb7595 100644 --- a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryEnabledTest.java +++ b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryEnabledTest.java @@ -16,11 +16,11 @@ */ package org.apache.camel.quarkus.component.kafka.deployment; -import java.util.Arrays; +import java.util.List; import java.util.Set; -import io.quarkus.bootstrap.model.AppArtifact; import io.quarkus.builder.Version; +import io.quarkus.maven.dependency.Dependency; import io.quarkus.test.QuarkusUnitTest; import jakarta.inject.Inject; import org.apache.camel.CamelContext; @@ -39,8 +39,8 @@ public class QuarkusKafkaClientFactoryEnabledTest { @RegisterExtension static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() .withConfigurationResource("application.properties") - .setForcedDependencies(Arrays.asList( - new AppArtifact("io.quarkus", "quarkus-kubernetes-service-binding", Version.getVersion()))) + .setForcedDependencies(List.of( + Dependency.of("io.quarkus", "quarkus-kubernetes-service-binding", Version.getVersion()))) .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); @Inject diff --git a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryTest.java b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryTest.java index f4bbf42a35a4..c8b0f885c375 100644 --- a/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryTest.java +++ b/extensions/kafka/deployment/src/test/java/org/apache/camel/quarkus/component/kafka/deployment/QuarkusKafkaClientFactoryTest.java @@ -16,11 +16,11 @@ */ package org.apache.camel.quarkus.component.kafka.deployment; -import java.util.Arrays; +import java.util.List; import java.util.Properties; -import io.quarkus.bootstrap.model.AppArtifact; import io.quarkus.builder.Version; +import io.quarkus.maven.dependency.Dependency; import io.quarkus.test.QuarkusUnitTest; import jakarta.inject.Inject; import org.apache.camel.component.kafka.KafkaClientFactory; @@ -40,8 +40,8 @@ public class QuarkusKafkaClientFactoryTest { @RegisterExtension static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() - .setForcedDependencies(Arrays.asList( - new AppArtifact("io.quarkus", "quarkus-kubernetes-service-binding", Version.getVersion()))) + .setForcedDependencies(List.of( + Dependency.of("io.quarkus", "quarkus-kubernetes-service-binding", Version.getVersion()))) .withConfigurationResource("application-configuration-merging.properties") .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)); diff --git a/extensions/openapi-java/deployment/src/test/java/org/apache/camel/quarkus/component/openapi/java/deployment/RESTOpenAPITest.java b/extensions/openapi-java/deployment/src/test/java/org/apache/camel/quarkus/component/openapi/java/deployment/RESTOpenAPITest.java index 0ee6b74fc849..68d7e97a830b 100644 --- a/extensions/openapi-java/deployment/src/test/java/org/apache/camel/quarkus/component/openapi/java/deployment/RESTOpenAPITest.java +++ b/extensions/openapi-java/deployment/src/test/java/org/apache/camel/quarkus/component/openapi/java/deployment/RESTOpenAPITest.java @@ -17,10 +17,10 @@ package org.apache.camel.quarkus.component.openapi.java.deployment; -import java.util.Arrays; +import java.util.List; -import io.quarkus.bootstrap.model.AppArtifact; import io.quarkus.builder.Version; +import io.quarkus.maven.dependency.Dependency; import io.quarkus.test.QuarkusUnitTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; @@ -35,8 +35,8 @@ public class RESTOpenAPITest { @RegisterExtension static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() - .setForcedDependencies(Arrays.asList( - new AppArtifact("io.quarkus", "quarkus-smallrye-openapi", Version.getVersion()))) + .setForcedDependencies(List.of( + Dependency.of("io.quarkus", "quarkus-smallrye-openapi", Version.getVersion()))) .withConfigurationResource("application.properties") .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(RestRoutes.class, QuarkusResource.class) diff --git a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java index 3e700f5f1d9f..dcbeada712f6 100644 --- a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java +++ b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java @@ -125,21 +125,21 @@ private String getClientSaslJaasConfig(String keycloakServerUrl) { } private String getPlainSaslJaasConfig(String keycloakInternalUrl, String keycloakServerUrl) { - return "'org.apache.kafka.common.security.plain.PlainLoginModule required " + + return "org.apache.kafka.common.security.plain.PlainLoginModule required " + "oauth.jwks.endpoint.uri=\"" + keycloakInternalUrl + "/realms/kafka-authz/protocol/openid-connect/certs\" " + "oauth.valid.issuer.uri=\"" + keycloakServerUrl + "/realms/kafka-authz\" " + "oauth.token.endpoint.uri=\"" + keycloakInternalUrl + "/realms/kafka-authz/protocol/openid-connect/token\" " + "oauth.client.id=\"kafka\" " + "oauth.client.secret=\"kafka-secret\" " + - "unsecuredLoginStringClaim_sub=\"admin\";'"; + "unsecuredLoginStringClaim_sub=\"admin\";"; } private String getOauthSaslJaasConfig(String keycloakInternalUrl, String keycloakServerUrl) { - return "'org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule required " + + return "org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule required " + "oauth.jwks.endpoint.uri=\"" + keycloakInternalUrl + "/realms/kafka-authz/protocol/openid-connect/certs\" " + "oauth.valid.issuer.uri=\"" + keycloakServerUrl + "/realms/kafka-authz\" " + "oauth.token.endpoint.uri=\"" + keycloakInternalUrl + "/realms/kafka-authz/protocol/openid-connect/token\" " + "oauth.client.id=\"kafka\" " + - "oauth.client.secret=\"kafka-secret\";'"; + "oauth.client.secret=\"kafka-secret\";"; } } diff --git a/pom.xml b/pom.xml index 669e7a31dae7..d80852153c30 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.2.3 2.4.0 2.0.2 - 3.12.0 + 3.13.0.CR1 4.0.0 2.6.1 @@ -75,7 +75,7 @@ 1.11.3 2.25.60 0.29.18 - 3.26.0 + 3.26.3 1.11.714 ${azure-sdk-bom-version} 1.49.1 @@ -104,7 +104,7 @@ 23.1.2 jdk21 4.0.21 - 1.64.0 + 1.65.1 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} @@ -130,7 +130,7 @@ ${jedis-client-version} 2.5.0 1.0.3 - 3.7.0 + 3.7.1 ${kudu-version} 2.0.0 1.4.0 @@ -150,7 +150,7 @@ 3.4.38 ${reactor-netty-version} 2.9.0 - 4.21.0 + 4.23.0 2.2 ${snakeyaml-engine-version} ${spring-version} @@ -167,7 +167,7 @@ ${web3j-version} ${web3j-quorum-version} ${zookeeper-version} - 1.5.5-6 + 1.5.6-3 0.7.1 @@ -268,7 +268,7 @@ 3.8.2 - 3.9.7 + 3.9.8 [${min-maven-version},) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 4cbb62407e13..7e8b29c6785c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6421,7 +6421,7 @@ com.github.luben zstd-jni - 1.5.5-6 + 1.5.6-3 com.github.mwiede @@ -6789,7 +6789,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel - 4.21.0 + 4.23.0 io.swagger.codegen.v3 @@ -6937,7 +6937,7 @@ org.apache.kafka connect-runtime - 3.7.0 + 3.7.1 io.swagger.core.v3 diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 7c359f7532ab..1a92079684c8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6421,7 +6421,7 @@ com.github.luben zstd-jni - 1.5.5-6 + 1.5.6-3 com.github.mwiede @@ -6749,7 +6749,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel - 4.21.0 + 4.23.0 io.swagger.codegen.v3 @@ -6882,7 +6882,7 @@ org.apache.kafka connect-runtime - 3.7.0 + 3.7.1 io.swagger.core.v3 diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 5170b3dc1893..202bc00ac7c8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6421,7 +6421,7 @@ com.github.luben zstd-jni - 1.5.5-6 + 1.5.6-3 com.github.mwiede @@ -6749,7 +6749,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel - 4.21.0 + 4.23.0 io.swagger.codegen.v3 @@ -6882,7 +6882,7 @@ org.apache.kafka connect-runtime - 3.7.0 + 3.7.1 io.swagger.core.v3