upstream/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-02-03 20:39:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

updating to quarkus 3.31.1 (#45612)
Some checks failed
Weblate Sync / Trigger Weblate to pull the latest changes (push) Has been cancelled
Details

Browse source 
* fix: updating to quarkus 3.31.0.CR1

closes: #45576

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

* updating test containers for 3.31.0.CR1

also adding a managed version for microprofile-metrics-api

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

* excluding quarkus-bootstrap-runner to prevent trace logging

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

* changing to new logging context for hibernate jpa

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

* switching to 3.31.0 release

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

* switching to 3.31.1 release

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

* Follow upgrading guide for Quarkus 3.31.0

Signed-off-by: Martin Bartoš <mabartos@redhat.com>

* turning of specific hibernate logging

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

* removing quarkus-bootstrap-runner from the model test classpath

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

---------

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
Signed-off-by: Martin Bartoš <mabartos@redhat.com>
Co-authored-by: Martin Bartoš <mabartos@redhat.com>
This commit is contained in:
Steven Hawkins 2026-02-02 11:50:56 -05:00 committed by GitHub
parent a2e2634940
commit 9462f0f00b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 52 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
operator/pom.xml
View file

@ -130,17 +130,17 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<artifactId>quarkus-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5-mockito</artifactId>
<artifactId>quarkus-junit-mockito</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5-component</artifactId>
<artifactId>quarkus-junit-component</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@ -178,6 +178,7 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.build.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</pluginManagement>
@ -186,6 +187,7 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.build.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>

19
pom.xml
View file

@ -45,8 +45,8 @@
<asciidoctor.plugin.version>1.5.8</asciidoctor.plugin.version>
<quarkus.version>3.30.5</quarkus.version>
<quarkus.build.version>3.30.5</quarkus.build.version>
<quarkus.version>3.31.1</quarkus.version>
<quarkus.build.version>3.31.1</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>
@ -91,6 +91,7 @@
<h2.version>2.4.240</h2.version>
<hibernate-orm.plugin.version>6.2.13.Final</hibernate-orm.plugin.version>
<hibernate.c3p0.version>6.2.13.Final</hibernate.c3p0.version>
<microprofile-metrics-api.version>5.1.2</microprofile-metrics-api.version>
<hibernate-validator.version>9.0.1.Final</hibernate-validator.version>
<infinispan.version>16.0.5</infinispan.version>
<protostream.version>6.0.3</protostream.version> <!-- For the annotation processor: keep in sync with the version shipped with Infinispan -->
@ -107,7 +108,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.2</log4j2-api.version> <!-- Odd name needs to align with Quarkus -->
<log4j2-api.version>2.25.3</log4j2-api.version> <!-- Odd name needs to align with Quarkus -->
<resteasy.version>6.2.15.Final</resteasy.version>
<resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
<owasp.html.sanitizer.version>20260101.1</owasp.html.sanitizer.version>
@ -154,15 +155,15 @@
<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>8.3.0</mysql-jdbc.version>
<mysql-jdbc.version>9.5.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>2.5.6</aws-jdbc-wrapper.version>
<postgresql-jdbc.version>42.7.8</postgresql-jdbc.version>
<postgresql-jdbc.version>42.7.9</postgresql-jdbc.version>
<mariadb.version>11.8</mariadb.version>
<mariadb.container>mirror.gcr.io/mariadb:${mariadb.version}</mariadb.container>
<mariadb-jdbc.version>3.5.6</mariadb-jdbc.version>
<mariadb-jdbc.version>3.5.7</mariadb-jdbc.version>
<mssql.version>2022</mssql.version>
<mssql.container>mcr.microsoft.com/mssql/server:${mssql.version}-latest</mssql.container>
<!-- this is the mssql driver version also used in the Quarkus BOM -->
@ -1337,6 +1338,12 @@
<type>test-jar</type>
<version>${infinispan.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
<artifactId>microprofile-metrics-api</artifactId>
<scope>test</scope>
<version>${microprofile-metrics-api.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

6
quarkus/config-api/pom.xml
View file

@ -43,6 +43,12 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-opentelemetry</artifactId>
<exclusions>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-runner</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

5
quarkus/runtime/src/main/resources/application.properties
View file

@ -105,4 +105,7 @@ mp.openapi.extensions.smallrye.duplicateOperationIdBehavior=FAIL
# Disable Error messages from smallrye.openapi
# related issue: https://github.com/keycloak/keycloak/issues/41871
quarkus.log.category."io.smallrye.openapi.runtime.scanner.dataobject".level=off
quarkus.log.category."io.smallrye.openapi.runtime.scanner.dataobject".level=off
# 3.31.1 appears to have a hibernate bug
quarkus.log.category."org.hibernate.orm.sql.exec".level=info

1
quarkus/server/pom.xml
View file

@ -68,6 +68,7 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.build.version}</version>
<extensions>true</extensions>
<configuration>
<finalName>keycloak</finalName>
<systemProperties>

2
quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CustomJpaEntityProviderDistTest.java vendored
View file

@ -61,7 +61,7 @@ public class CustomJpaEntityProviderDistTest {
}
@Test
@Launch({"start-dev", "--db=dev-file", "--log-level=org.hibernate.jpa.internal.util.LogHelper:debug,org.keycloak.quarkus.deployment.KeycloakProcessor:debug", "--db-kind-new-user-store=dev-mem", "--db-kind-client-store=dev-file", "--db-kind-pu-without-dialect-store=dev-mem"})
@Launch({"start-dev", "--db=dev-file", "--log-level=org.hibernate.orm.jpa:debug,org.keycloak.quarkus.deployment.KeycloakProcessor:debug", "--db-kind-new-user-store=dev-mem", "--db-kind-client-store=dev-file", "--db-kind-pu-without-dialect-store=dev-mem"})
void testUserManagedEntityNotAddedToDefaultPU(CLIResult cliResult) {
cliResult.assertMessage(MULTIPLE_DATASOURCES_MSG);
cliResult.assertMessage("Datasource name 'client-store' is obtained from the 'Persistence unit name' configuration property in persistence.xml file. Use 'client-store' name for datasource options like 'db-kind-client-store'.");

24
quarkus/tests/junit5/pom.xml
View file

@ -58,6 +58,12 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>testcontainers-infinispan</artifactId>
<exclusions>
<exclusion>
<groupId>org.testcontainers</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@ -71,39 +77,39 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5-internal</artifactId>
<artifactId>quarkus-junit-internal</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<artifactId>quarkus-junit</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<artifactId>testcontainers-junit-jupiter</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<artifactId>testcontainers-postgresql</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>cockroachdb</artifactId>
<artifactId>testcontainers-cockroachdb</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mariadb</artifactId>
<artifactId>testcontainers-mariadb</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mysql</artifactId>
<artifactId>testcontainers-mysql</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mssqlserver</artifactId>
<artifactId>testcontainers-mssqlserver</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>tidb</artifactId>
<artifactId>testcontainers-tidb</artifactId>
</dependency>
<!-- JDBC Drivers -->

6
services/pom.xml
View file

@ -121,6 +121,12 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-micrometer</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-runner</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>

2
test-framework/db-tidb/pom.xml
View file

@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>tidb</artifactId>
<artifactId>testcontainers-tidb</artifactId>
</dependency>
</dependencies>
</project>