From 3ee301621ed4eba6e919b4ef99197f56a52d1c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Barto=C5=A1?= <mabartos@redhat.com>
Date: Wed, 24 Sep 2025 09:47:28 +0200
Subject: [PATCH 1/2] Upgrade to Quarkus 3.20.3 LTS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #41371

Closes #42491

Closes #42492

Signed-off-by: Martin Bartoš <mabartos@redhat.com>
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 36588eaabfc1..dbd3c17a357d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,8 +45,8 @@
 
         <asciidoctor.plugin.version>1.5.8</asciidoctor.plugin.version>
 
-        <quarkus.version>3.20.2.2</quarkus.version>
-        <quarkus.build.version>3.20.2.2</quarkus.build.version>
+        <quarkus.version>3.20.3</quarkus.version>
+        <quarkus.build.version>3.20.3</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>
@@ -161,7 +161,7 @@
         <postgresql-jdbc.version>42.7.7</postgresql-jdbc.version>
         <mariadb.version>11.4</mariadb.version>
         <mariadb.container>mirror.gcr.io/mariadb:${mariadb.version}</mariadb.container>
-        <mariadb-jdbc.version>3.5.3</mariadb-jdbc.version>
+        <mariadb-jdbc.version>3.5.5</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 -->

From 1b3fd5b08896bf929dc1cf37249e978fa926b83c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Barto=C5=A1?= <mabartos@redhat.com>
Date: Wed, 24 Sep 2025 09:47:53 +0200
Subject: [PATCH 2/2] Revert "MariaDB connector dependency is not properly
 overriden (#41372)"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 089975417b5819d08d8652525dfbcb044e42b7c2.

Closes #41373

Signed-off-by: Martin Bartoš <mabartos@redhat.com>
---
 pom.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index dbd3c17a357d..f8e1fd98cfb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -606,14 +606,6 @@
                 <version>${nashorn.version}</version>
             </dependency>
 
-            <!-- BEGIN Remove once org.mariadb.jdbc:mariadb-java-client:3.5.3 is part of Quarkus distribution. See https://github.com/keycloak/keycloak/issues/41371 -->
-            <dependency>
-                <groupId>org.mariadb.jdbc</groupId>
-                <artifactId>mariadb-java-client</artifactId>
-                <version>${mariadb-jdbc.version}</version>
-            </dependency>
-            <!-- END -->
-
             <!-- Twitter -->
             <dependency>
                 <groupId>org.twitter4j</groupId>