You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2024/06/28 03:43:08 UTC
(camel-quarkus) branch quarkus-main updated (5717392fc4 -> 5316b800dd)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard 5717392fc4 Upgrade Quarkus to 3.13.0.CR1
add b763148b6a Set -Xmx4600m for Jenkins build jobs
add dbeeea9e10 Upgrade to maven-enforcer-plugin 3.5.0 and cq-maven-plugin 4.9.0 and fix dependency convergence issues
add b00a01c9d7 Ensure additional caffeine cache classes are registered for reflection if stats are enabled
add f3423994d3 Bump quarkiverse-groovy.version from 3.11.0 to 3.12.0 (#6235)
add bf0d926633 Bump net.revelc.code:impsort-maven-plugin from 1.10.0 to 1.11.0 (#6236)
new 5316b800dd Upgrade Quarkus to 3.13.0.CR1
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5717392fc4)
\
N -- N -- N refs/heads/quarkus-main (5316b800dd)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 5 ++++-
Jenkinsfile.sonarcloud | 6 ++++++
.../caffeine/deployment/CaffeineProcessor.java | 21 +++++++++++++++++--
.../src/main/resources/application.properties | 2 +-
pom.xml | 10 +++++----
poms/bom/pom.xml | 20 ++++++++++++++++++
poms/bom/src/main/generated/flattened-full-pom.xml | 24 ++++++++++++++++++++--
.../src/main/generated/flattened-reduced-pom.xml | 24 ++++++++++++++++++++--
.../generated/flattened-reduced-verbose-pom.xml | 24 ++++++++++++++++++++--
9 files changed, 122 insertions(+), 14 deletions(-)
copy integration-tests/{joor => caffeine}/src/main/resources/application.properties (94%)
(camel-quarkus) 01/01: Upgrade Quarkus to 3.13.0.CR1
Posted by gi...@apache.org.
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 5316b800ddd6b52cd34af5790ed4413d4802af82
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jun 24 11:24:38 2024 +0100
Upgrade Quarkus to 3.13.0.CR1
---
docs/antora.yml | 2 +-
.../camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java | 8 ++++----
pom.xml | 4 ++--
3 files changed, 7 insertions(+), 7 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 d378882b44..9fa36c4963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
<quarkiverse-mybatis.version>2.2.2</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/ -->
@@ -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 -->