This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c761be0a69e1a45ba6ac996a19a45379dbc7c2ab Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Mon Jun 24 11:24:38 2024 +0100 Upgrade Quarkus to 3.13.0.CR1 --- docs/antora.yml | 2 +- .../quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java | 8 ++++---- pom.xml | 10 +++++----- poms/bom/src/main/generated/flattened-full-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index ba98deb2fa..bf5513271d 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -36,7 +36,7 @@ asciidoc: 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/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 3e700f5f1d..dcbeada712 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 @@ public class KafkaKeycloakTestResource implements QuarkusTestResourceLifecycleMa } 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 c2380b2541..e0ffac5075 100644 --- a/pom.xml +++ b/pom.xml @@ -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>999-SNAPSHOT</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/ --> @@ -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.0</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> @@ -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 --> <kryo.version>2.24.0</kryo.version><!-- @sync org.apache.flink:flink-core:${flink-version} dep:com.esotericsoftware.kryo:kryo --> @@ -166,7 +166,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> @@ -267,7 +267,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 --> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 5eae760722..86efc58a91 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6395,7 +6395,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} --> @@ -6896,7 +6896,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} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 082d6d3be7..377bf9353e 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6395,7 +6395,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> @@ -6841,7 +6841,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> 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 c2d26ea6ec..c38a9e09a9 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6395,7 +6395,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} --> @@ -6841,7 +6841,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} -->