From 70db844bdabe27e074f42cde7a3a109ffc625cca Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 20 Dec 2023 14:41:21 +0100
Subject: [PATCH] XWIKI-21723: Upgrade to MariaDB connector 3.3.2

---
 14/mariadb-tomcat/Dockerfile   |  4 ++--
 15.5/mariadb-tomcat/Dockerfile |  4 ++--
 15/mariadb-tomcat/Dockerfile   |  4 ++--
 build.gradle                   | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile
index 5e0d358..3d4df19 100644
--- a/14/mariadb-tomcat/Dockerfile
+++ b/14/mariadb-tomcat/Dockerfile
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MariaDB, download the MariaDB driver version from the Maven Central repository to control the version 
 # used.
-ENV MARIADB_JDBC_VERSION="3.3.1"
-ENV MARIADB_JDBC_SHA256="22c7520ed57aeb8d926d8fcb5c84b10aa46b633f965c783f5c6b65efb675545b"
+ENV MARIADB_JDBC_VERSION="3.3.2"
+ENV MARIADB_JDBC_SHA256="2a67ef3cc1ca481965a0e7f2d4174d126f3464d02b4055a441261fad8c196769"
 ENV MARIADB_JDBC_PREFIX="https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/${MARIADB_JDBC_VERSION}"
 ENV MARIADB_JDBC_ARTIFACT="mariadb-java-client-${MARIADB_JDBC_VERSION}.jar"
 ENV MARIADB_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MARIADB_JDBC_ARTIFACT}"
diff --git a/15.5/mariadb-tomcat/Dockerfile b/15.5/mariadb-tomcat/Dockerfile
index ec466d3..003fa46 100644
--- a/15.5/mariadb-tomcat/Dockerfile
+++ b/15.5/mariadb-tomcat/Dockerfile
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MariaDB, download the MariaDB driver version from the Maven Central repository to control the version 
 # used.
-ENV MARIADB_JDBC_VERSION="3.3.1"
-ENV MARIADB_JDBC_SHA256="22c7520ed57aeb8d926d8fcb5c84b10aa46b633f965c783f5c6b65efb675545b"
+ENV MARIADB_JDBC_VERSION="3.3.2"
+ENV MARIADB_JDBC_SHA256="2a67ef3cc1ca481965a0e7f2d4174d126f3464d02b4055a441261fad8c196769"
 ENV MARIADB_JDBC_PREFIX="https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/${MARIADB_JDBC_VERSION}"
 ENV MARIADB_JDBC_ARTIFACT="mariadb-java-client-${MARIADB_JDBC_VERSION}.jar"
 ENV MARIADB_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MARIADB_JDBC_ARTIFACT}"
diff --git a/15/mariadb-tomcat/Dockerfile b/15/mariadb-tomcat/Dockerfile
index 9541fdb..677a8a9 100644
--- a/15/mariadb-tomcat/Dockerfile
+++ b/15/mariadb-tomcat/Dockerfile
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MariaDB, download the MariaDB driver version from the Maven Central repository to control the version 
 # used.
-ENV MARIADB_JDBC_VERSION="3.3.1"
-ENV MARIADB_JDBC_SHA256="22c7520ed57aeb8d926d8fcb5c84b10aa46b633f965c783f5c6b65efb675545b"
+ENV MARIADB_JDBC_VERSION="3.3.2"
+ENV MARIADB_JDBC_SHA256="2a67ef3cc1ca481965a0e7f2d4174d126f3464d02b4055a441261fad8c196769"
 ENV MARIADB_JDBC_PREFIX="https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/${MARIADB_JDBC_VERSION}"
 ENV MARIADB_JDBC_ARTIFACT="mariadb-java-client-${MARIADB_JDBC_VERSION}.jar"
 ENV MARIADB_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MARIADB_JDBC_ARTIFACT}"
diff --git a/build.gradle b/build.gradle
index ff75d0c..08960b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,24 +48,24 @@ def tokens = [
         xwikiSha256: 'a48057e5d82683e6f722be3868d8013b8e4d27d970b03309565a7f5a46f049f9',
         mysqlJDBCVersion: '8.2.0',
         mysqlJDBCSha256: '06f14fbd664d0e382347489e66495ca27ab7e6c2e1d9969a496931736197465f',
-        mariadbJDBCVersion: '3.3.1',
-        mariadbJDBCSha256: '22c7520ed57aeb8d926d8fcb5c84b10aa46b633f965c783f5c6b65efb675545b'
+        mariadbJDBCVersion: '3.3.2',
+        mariadbJDBCSha256: '2a67ef3cc1ca481965a0e7f2d4174d126f3464d02b4055a441261fad8c196769'
     ],
     '15.5': [
         xwikiVersion: '15.5.4',
         xwikiSha256: '271159495bfe8461f209dc2674faef918b74e4c5a97edfc51e9608a419aa78e6',
         mysqlJDBCVersion: '8.2.0',
         mysqlJDBCSha256: '06f14fbd664d0e382347489e66495ca27ab7e6c2e1d9969a496931736197465f',
-        mariadbJDBCVersion: '3.3.1',
-        mariadbJDBCSha256: '22c7520ed57aeb8d926d8fcb5c84b10aa46b633f965c783f5c6b65efb675545b'
+        mariadbJDBCVersion: '3.3.2',
+        mariadbJDBCSha256: '2a67ef3cc1ca481965a0e7f2d4174d126f3464d02b4055a441261fad8c196769'
     ],
     '14': [
         xwikiVersion: '14.10.20',
         xwikiSha256: 'c418601676d61893ccb9e066b1f2bcce56717b49e5c2456656b6960db6bd6e4c',
         mysqlJDBCVersion: '8.2.0',
         mysqlJDBCSha256: '06f14fbd664d0e382347489e66495ca27ab7e6c2e1d9969a496931736197465f',
-        mariadbJDBCVersion: '3.3.1',
-        mariadbJDBCSha256: '22c7520ed57aeb8d926d8fcb5c84b10aa46b633f965c783f5c6b65efb675545b'
+        mariadbJDBCVersion: '3.3.2',
+        mariadbJDBCSha256: '2a67ef3cc1ca481965a0e7f2d4174d126f3464d02b4055a441261fad8c196769'
     ]
 ]
 
-- 
GitLab