Skip to content

Commit

Permalink
Upgrade Quarkus to 3.13.0.CR1
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesnetherton committed Jul 22, 2024
1 parent 8070038 commit d28a35e
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 42 deletions.
4 changes: 2 additions & 2 deletions docs/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -104,6 +105,7 @@ void registerICMPHelper(BuildProducer<RuntimeInitializedClassBuildItem> initiali
if (OS.determineOS() != OS.LINUX) {
initializedClasses.produce(new RuntimeInitializedClassBuildItem(ICMPHelper.class.getName()));
}
initializedClasses.produce(new RuntimeInitializedClassBuildItem(OperatingSystemMXBeanSupport.class.getName()));
}

private static void registerTypeHierarchy(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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\";";
}
}
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<quarkiverse-mybatis.version>2.2.3</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.4.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ -->
<quarkiverse-tika.version>2.0.2</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
<quarkus.version>3.12.0</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus.version>3.13.0.CR1</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>4.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>2.6.1</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->

Expand All @@ -75,7 +75,7 @@
<avro.version>1.11.3</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<awssdk.version>2.25.60</awssdk.version><!-- @sync io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version} prop:awssdk.version -->
<awscrt.version>0.29.18</awscrt.version><!-- @sync software.amazon.awssdk:aws-sdk-java-pom:${awssdk.version} prop:awscrt.version -->
<assertj.version>3.26.0</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
<assertj.version>3.26.3</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
<azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version>
<azure-core.version>1.49.1</azure-core.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-core -->
Expand Down Expand Up @@ -104,7 +104,7 @@
<graalvm.version>23.1.2</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
<graalvm-docs.version>jdk21</graalvm-docs.version><!-- @sync io.quarkus:quarkus-documentation:${quarkus.version} prop:graal-community.tag-for-documentation -->
<groovy.version>4.0.21</groovy.version><!-- @sync io.quarkiverse.groovy:quarkus-groovy-parent:${quarkiverse-groovy.version} prop:groovy.version -->
<grpc.version>1.64.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<grpc.version>1.65.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-base.version>${hapi-base-version}</hapi-base.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
Expand All @@ -130,7 +130,7 @@
<jedis-client.version>${jedis-client-version}</jedis-client.version>
<json-smart.version>2.5.0</json-smart.version><!-- @sync com.jayway.jsonpath:json-path:${json-path.version} dep:net.minidev:json-smart -->
<jxmpp.version>1.0.3</jxmpp.version><!-- @sync org.apache.camel:camel-xmpp:${camel.version} dep:org.jxmpp:jxmpp-jid -->
<kafka.version>3.7.0</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kafka.version>3.7.1</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
<kotlin.version>2.0.0</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
<kotlinx.version>1.4.0</kotlinx.version><!--Used by com.squareup.wire:wire-compiler referenced from aws2:kinesis -->
Expand All @@ -150,7 +150,7 @@
<reactor-core.version>3.4.38</reactor-core.version><!-- @sync com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core -->
<reactor-netty.version>${reactor-netty-version}</reactor-netty.version>
<retrofit.version>2.9.0</retrofit.version><!-- @sync org.influxdb:influxdb-java:${influxdb.version} dep:com.squareup.retrofit2:retrofit -->
<smallrye.reactive.messaging.camel.version>4.21.0</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>4.23.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<snakeyaml.version>2.2</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
<snakeyaml-engine.version>${snakeyaml-engine-version}</snakeyaml-engine.version><!-- Resolve conflict between camel-snakeyaml & kubernetes-client -->
<spring.version>${spring-version}</spring.version>
Expand All @@ -167,7 +167,7 @@
<web3j.version>${web3j-version}</web3j.version>
<web3j.quorum.version>${web3j-quorum-version}</web3j.quorum.version>
<zookeeper.version>${zookeeper-version}</zookeeper.version>
<zstd-jni.version>1.5.5-6</zstd-jni.version><!-- @sync org.apache.kafka:kafka-clients:${kafka.version} dep:com.github.luben:zstd-jni -->
<zstd-jni.version>1.5.6-3</zstd-jni.version><!-- @sync org.apache.kafka:kafka-clients:${kafka.version} dep:com.github.luben:zstd-jni -->

<!-- Test dependency versions (keep sorted alphabetically) -->
<certificate.generator.version>0.7.1</certificate.generator.version>
Expand Down Expand Up @@ -268,7 +268,7 @@

<!-- maven-enforcer-plugin -->
<min-maven-version>3.8.2</min-maven-version>
<target-maven-version>3.9.7</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
<target-maven-version>3.9.8</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
<supported-maven-versions>[${min-maven-version},)</supported-maven-versions>

<!-- maven-release-plugin -->
Expand Down
6 changes: 3 additions & 3 deletions poms/bom/src/main/generated/flattened-full-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6421,7 +6421,7 @@
<dependency>
<groupId>com.github.luben</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>zstd-jni</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.5.5-6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.5.6-3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>com.github.mwiede</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
Expand Down Expand Up @@ -6789,7 +6789,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.21.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.23.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.swagger.codegen.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
Expand Down Expand Up @@ -6937,7 +6937,7 @@
<dependency>
<groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>connect-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.7.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.7.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>io.swagger.core.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
Expand Down
6 changes: 3 additions & 3 deletions poms/bom/src/main/generated/flattened-reduced-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6421,7 +6421,7 @@
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>1.5.5-6</version>
<version>1.5.6-3</version>
</dependency>
<dependency>
<groupId>com.github.mwiede</groupId>
Expand Down Expand Up @@ -6749,7 +6749,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-camel</artifactId>
<version>4.21.0</version>
<version>4.23.0</version>
</dependency>
<dependency>
<groupId>io.swagger.codegen.v3</groupId>
Expand Down Expand Up @@ -6882,7 +6882,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-runtime</artifactId>
<version>3.7.0</version>
<version>3.7.1</version>
<exclusions>
<exclusion>
<groupId>io.swagger.core.v3</groupId>
Expand Down
6 changes: 3 additions & 3 deletions poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6421,7 +6421,7 @@
<dependency>
<groupId>com.github.luben</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>zstd-jni</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.5.5-6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.5.6-3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>com.github.mwiede</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
Expand Down Expand Up @@ -6749,7 +6749,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.21.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.23.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.swagger.codegen.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
Expand Down Expand Up @@ -6882,7 +6882,7 @@
<dependency>
<groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>connect-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.7.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.7.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>io.swagger.core.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
Expand Down

0 comments on commit d28a35e

Please sign in to comment.