8000 Upgrade to Quarkus 3.37.4 by Pepo48 · Pull Request #51289 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content
< 8000 /div>

Upgrade to Quarkus 3.37.4 #51289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vmuzikar merged 1 commit into from
Jul 31, 2026
Merged

Upgrade to Quarkus 3.37.4 #51289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@

<asciidoctor.plugin.version>1.5.8</asciidoctor.plugin.version>

<quarkus.version>3.33.2.1</quarkus.version>
<quarkus.build.version>3.33.2.1</quarkus.build.version>
<quarkus.version>3.37.4</quarkus.version>
<quarkus.build.version>3.37.4</quarkus.build.version>
<jboss-logging-annotations.version>3.0.4.Final</jboss-logging-annotations.version> <!-- keep in sync with the version used by quarkus -->

<project.build-time>${timestamp}</project.build-time>
Expand Down Expand Up @@ -99,7 +99,7 @@
<jboss-servlet-api_4.0_spec>2.0.0.Final</jboss-servlet-api_4.0_spec>
<jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>2.0.1.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>
<jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>2.0.0.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
<log4j2-api.version>2.25.4</log4j2-api.version> <!-- Odd name needs to align with Quarkus -->
<log4j2-api.version>2.26.0</log4j2-api.version> <!-- Odd name needs to align with Quarkus -->
8000 <resteasy.version>6.2.16.Final</resteasy.version>
<resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
<owasp.html.sanitizer.version>20260101.1</owasp.html.sanitizer.version>
Expand All @@ -111,7 +111,7 @@
<sun.activation.version>1.2.2</sun.activation.version>
<org.glassfish.jaxb.xsom.version>2.3.3-b02</org.glassfish.jaxb.xsom.version>
<undertow.version>2.3.24.Final</undertow.version>
<wildfly-elytron.version>2.8.4.Final</wildfly-elytron.version>
<wildfly-elytron.version>2.9.1.Final</wildfly-elytron.version>
<elytron.undertow-server.version>1.9.0.Final</elytron.undertow-server.version>
<woodstox.version>6.0.3</woodstox.version>
<wildfly.common.quarkus.aligned.version>1.5.4.Final-format-001</wildfly.common.quarkus.aligned.version>
Expand Down Expand Up @@ -146,27 +146,27 @@
<tidb.container>mirror.gcr.io/pingcap/tidb:${tidb.version}</tidb.container>
<mysql.version>8.4</mysql.version>
<mysql.container>mirror.gcr.io/mysql:${mysql.version}</mysql.container>
<mysql-jdbc.version>9.6.0</mysql-jdbc.version>
<mysql-jdbc.version>9.7.0</mysql-jdbc.version>
<postgresql.version>18</postgresql.version>
<postgresql.container>mirror.gcr.io/postgres:${postgresql.version}</postgresql.container>
<aurora-postgresql.version>17.5</aurora-postgresql.version>
<aws-jdbc-wrapper.version>4.0.1</aws-jdbc-wrapper.version>
<cnpg.major-minor-version>1.29</cnpg.major-minor-version>
<cnpg.patch-version>0</cnpg.patch-version>
<cnpg.version>${cnpg.major-minor-version}.${cnpg.patch-version}</cnpg.version>
<postgresql-jdbc.version>42.7.11</postgresql-jdbc.version>
<postgresql-jdbc.version>42.7.13</postgresql-jdbc.version>
<mariadb.version>11.8</mariadb.version>
<mariadb.container>mirror.gcr.io/mariadb:${mariadb.version}</mariadb.container>
<mariadb-jdbc.version>3.5.7</mariadb-jdbc.version>
<mariadb-jdbc.version>3.5.9</mariadb-jdbc.version>
<mssql.version>2022</mssql.version>
<mssql.container>mcr.microsoft.com/mssql/server:${mssql.version}-latest</mssql.container>
<mssql.collation>Latin1_General_100_CI_AS_SC_UTF8</mssql.collation>
<!-- this is the mssql driver version also used in the Quarkus BOM -->
<mssql-jdbc.version>13.2.1.jre11</mssql-jdbc.version>
<mssql-jdbc.version>13.4.0.jre11</mssql-jdbc.version>
<oracledb.version>23.5</oracledb.version>
<oracledb.container>mirror.gcr.io/gvenzl/oracle-free:${oracledb.version}-slim-faststart</oracledb.container>
<!-- this is the oracle driver version also used in the Quarkus BOM -->
<oracle-jdbc.version>23.26.0.0.0</oracle-jdbc.version>
<oracle-jdbc.version>23.26.2.0.0</oracle-jdbc.version>
<!-- Custom image, lives in test-framework/db-edb/container -->
<edb.container>quay.io/keycloakqe/enterprisedb:${edb.version}</edb.container>
<edb.version>18</edb.version>
Expand All @@ -180,7 +180,7 @@
<junit.version>4.13.2</junit.version>
<picketlink.version>2.7.0.Final</picketlink.version>
<!-- Needs to be aligned with Quarkus, handled in quarkus/set-quarkus-version.sh script -->
<version.surefire.plugin>3.5.4</version.surefire.plugin>
<version.surefire.plugin>3.5.6</version.surefire.plugin>
<xml-apis.version>1.4.01</xml-apis.version>
<subethasmtp.version>3.1.7</subethasmtp.version>
<assertj-core.version>3.22.0</assertj-core.version>
Expand Down
2 changes: 1 addition & 1 deletion ...kus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <hidden>");
cliResult.assertMessage("Authorization: DPoP <hidden>");
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=<hidden>".formatted(cookie)));
}
}
1 change: 0 additions & 1 deletion ...base/src/test/java/org/keycloak/tests/oid4vc/preauth/OID4VCredentialOfferPreAuthTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions tests/base/src/test/java/org/keycloak/tests/tracing/TracingProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
Loading
0