From 0591f0ebcbf85bf70f49a50e3546b0a19b94dd1c Mon Sep 17 00:00:00 2001 From: Peter Zaoral Date: Wed, 29 Jul 2026 17:14:36 +0200 Subject: [PATCH] Upgrade to Quarkus 3.37.4 Closes #51273 Signed-off-by: Peter Zaoral --- pom.xml | 20 +++++++++---------- .../tracing/OTelHttpClientFactory.java | 2 +- .../keycloak/it/cli/dist/LoggingDistTest.java | 9 +++++---- .../OID4VCredentialOfferPreAuthTest.java | 1 - .../tests/tracing/TracingProviderTest.java | 3 +-- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 044ae3cd5904..df2c5c0a59bc 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ 1.5.8 - 3.33.2.1 - 3.33.2.1 + 3.37.4 + 3.37.4 3.0.4.Final ${timestamp} @@ -99,7 +99,7 @@ 2.0.0.Final 2.0.1.Final 2.0.0.Final - 2.25.4 + 2.26.0 6.2.16.Final ${resteasy.version} 20260101.1 @@ -111,7 +111,7 @@ 1.2.2 2.3.3-b02 2.3.24.Final - 2.8.4.Final + 2.9.1.Final 1.9.0.Final 6.0.3 1.5.4.Final-format-001 @@ -146,7 +146,7 @@ mirror.gcr.io/pingcap/tidb:${tidb.version} 8.4 mirror.gcr.io/mysql:${mysql.version} - 9.6.0 + 9.7.0 18 mirror.gcr.io/postgres:${postgresql.version} 17.5 @@ -154,19 +154,19 @@ 1.29 0 ${cnpg.major-minor-version}.${cnpg.patch-version} - 42.7.11 + 42.7.13 11.8 mirror.gcr.io/mariadb:${mariadb.version} - 3.5.7 + 3.5.9 2022 mcr.microsoft.com/mssql/server:${mssql.version}-latest Latin1_General_100_CI_AS_SC_UTF8 - 13.2.1.jre11 + 13.4.0.jre11 23.5 mirror.gcr.io/gvenzl/oracle-free:${oracledb.version}-slim-faststart - 23.26.0.0.0 + 23.26.2.0.0 quay.io/keycloakqe/enterprisedb:${edb.version} 18 @@ -180,7 +180,7 @@ 4.13.2 2.7.0.Final - 3.5.4 + 3.5.6 1.4.01 3.1.7 3.22.0 diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientFactory.java index 32a9450cbd58..7c3bf30c5ec1 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientFactory.java @@ -48,7 +48,7 @@ public String getId() { @Override protected HttpClientBuilder newHttpClientBuilder(KeycloakSession session) { var provider = (OTelTracingProvider) session.getProvider(TracingProvider.class); - return new HttpClientBuilder(ApacheHttpClientTelemetry.builder(provider.getOpenTelemetry()).build().newHttpClientBuilder()); + return new HttpClientBuilder(ApacheHttpClientTelemetry.builder(provider.getOpenTelemetry()).build().createHttpClientBuilder()); } @Override diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java index 550da23bf6e2..d4358aa1c262 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java @@ -381,7 +381,8 @@ void telemetryLogsEnabled(CLIResult cliResult) { cliResult.assertStartedDevMode(); cliResult.assertMessage("opentelemetry"); cliResult.assertMessage("service.name=\"keycloak\""); - cliResult.assertMessage("Failed to export LogsRequestMarshaler."); + cliResult.assertMessage("Failed to export"); + cliResult.assertMessage("error message: Connection refused"); } @Test @@ -438,10 +439,10 @@ private void assertHttpAccessLogMaskedCookies(CLIResult cliResult) { // Verify that sensitive cookie values are masked in the access log cliResult.assertMessage("[org.keycloak.http.access-log]"); - cliResult.assertMessage("Authorization: Bearer ..."); - cliResult.assertMessage("Authorization: DPoP ..."); + cliResult.assertMessage("Authorization: Bearer "); + cliResult.assertMessage("Authorization: DPoP "); cliResult.assertMessage("Cookie: SOMETHING=something-not-sensitive"); cliResult.assertMessage("Content-Language: cs"); - HttpAccessLogOptions.DEFAULT_HIDDEN_COOKIES.forEach(cookie -> cliResult.assertMessage("Cookie: %s=...".formatted(cookie))); + HttpAccessLogOptions.DEFAULT_HIDDEN_COOKIES.forEach(cookie -> cliResult.assertMessage("Cookie: %s=".formatted(cookie))); } } diff --git a/tests/base/src/test/java/org/keycloak/tests/oid4vc/preauth/OID4VCredentialOfferPreAuthTest.java b/tests/base/src/test/java/org/keycloak/tests/oid4vc/preauth/OID4VCredentialOfferPreAuthTest.java index b71be8a0186e..44c92a83aef5 100644 --- a/tests/base/src/test/java/org/keycloak/tests/oid4vc/preauth/OID4VCredentialOfferPreAuthTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/oid4vc/preauth/OID4VCredentialOfferPreAuthTest.java @@ -35,7 +35,6 @@ import static org.keycloak.constants.OID4VCIConstants.CREDENTIAL_OFFER_CREATE; import static org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerEndpoint.CREDENTIAL_OFFER_LIFESPAN_REALM_ATTRIBUTE_KEY; import static org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerEndpoint.DEFAULT_CREDENTIAL_OFFER_LIFESPAN_S; - import static org.keycloak.tests.oid4vc.CredentialOfferStateUtils.getCredentialOfferStateRecord; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/tests/base/src/test/java/org/keycloak/tests/tracing/TracingProviderTest.java b/tests/base/src/test/java/org/keycloak/tests/tracing/TracingProviderTest.java index aac67cf0803e..be8790aebc7a 100644 --- a/tests/base/src/test/java/org/keycloak/tests/tracing/TracingProviderTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/tracing/TracingProviderTest.java @@ -13,7 +13,6 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.StatusCode; -import io.opentelemetry.api.trace.TraceFlags; import io.opentelemetry.sdk.trace.ReadableSpan; import io.opentelemetry.sdk.trace.data.ExceptionEventData; import io.opentelemetry.sdk.trace.data.StatusData; @@ -84,7 +83,7 @@ public void spanInfo() { var context = current.getSpanContext(); assertThat(context, is(span.getSpanContext())); - assertThat(context.getTraceFlags(), is(TraceFlags.getSampled())); + assertThat(context.getTraceFlags().isSampled(), is(true)); assertThat(current.isRecording(), is(true)); assertThat(current instanceof ReadableSpan, is(true));