From 0ecfbfb52fd01f45571f8b28d98584f7e221e24f Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 9 Nov 2022 17:12:12 +0100
Subject: [PATCH] XWIKI-20345: Upgrade to MariaDB connector 3.0.9

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

diff --git a/13/mariadb-tomcat/Dockerfile b/13/mariadb-tomcat/Dockerfile
index bf2a8b1..c196443 100644
--- a/13/mariadb-tomcat/Dockerfile
+++ b/13/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.0.8"
-ENV MARIADB_JDBC_SHA256="83697e1c44e77476123ab63cd8bb2ca96c1a349269f307c339f97caced2d0dd6"
+ENV MARIADB_JDBC_VERSION="3.0.9"
+ENV MARIADB_JDBC_SHA256="2a004c8ab43173a2a0d10d25aadfc57b8012fe1f68bbd816196df814b5000c1a"
 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/14.4/mariadb-tomcat/Dockerfile b/14.4/mariadb-tomcat/Dockerfile
index 24d5edf..f908df2 100644
--- a/14.4/mariadb-tomcat/Dockerfile
+++ b/14.4/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.0.8"
-ENV MARIADB_JDBC_SHA256="83697e1c44e77476123ab63cd8bb2ca96c1a349269f307c339f97caced2d0dd6"
+ENV MARIADB_JDBC_VERSION="3.0.9"
+ENV MARIADB_JDBC_SHA256="2a004c8ab43173a2a0d10d25aadfc57b8012fe1f68bbd816196df814b5000c1a"
 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/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile
index b8edc23..7f0d3f8 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.0.8"
-ENV MARIADB_JDBC_SHA256="83697e1c44e77476123ab63cd8bb2ca96c1a349269f307c339f97caced2d0dd6"
+ENV MARIADB_JDBC_VERSION="3.0.9"
+ENV MARIADB_JDBC_SHA256="2a004c8ab43173a2a0d10d25aadfc57b8012fe1f68bbd816196df814b5000c1a"
 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 f9b3f32..d53146d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,24 +47,24 @@ def tokens = [
         xwikiSha256: '9a8639b590b2612c1603ac6788fe83b4d79dbaad484cc5c60230c00f16781460',
         mysqlJDBCVersion: '8.0.30',
         mysqlJDBCSha256: 'b5bf2f0987197c30adf74a9e419b89cda4c257da2d1142871f508416d5f2227a',
-        mariadbJDBCVersion: '3.0.8',
-        mariadbJDBCSha256: '83697e1c44e77476123ab63cd8bb2ca96c1a349269f307c339f97caced2d0dd6'
+        mariadbJDBCVersion: '3.0.9',
+        mariadbJDBCSha256: '2a004c8ab43173a2a0d10d25aadfc57b8012fe1f68bbd816196df814b5000c1a'
     ],
     '14.4': [
         xwikiVersion: '14.4.6',
         xwikiSha256: 'd5c6c9c027b19776a4d0b56af7472f4e9113b8953b1d39e9dac98d6bed1fcb16',
         mysqlJDBCVersion: '8.0.30',
         mysqlJDBCSha256: 'b5bf2f0987197c30adf74a9e419b89cda4c257da2d1142871f508416d5f2227a',
-        mariadbJDBCVersion: '3.0.8',
-        mariadbJDBCSha256: '83697e1c44e77476123ab63cd8bb2ca96c1a349269f307c339f97caced2d0dd6'
+        mariadbJDBCVersion: '3.0.9',
+        mariadbJDBCSha256: '2a004c8ab43173a2a0d10d25aadfc57b8012fe1f68bbd816196df814b5000c1a'
     ],
     '13': [
         xwikiVersion: '13.10.10',
         xwikiSha256: 'bae87a16d291d321d0848fcba55e455bfcd4b1890597cd9b735d98013cf44bad',
         mysqlJDBCVersion: '8.0.30',
         mysqlJDBCSha256: 'b5bf2f0987197c30adf74a9e419b89cda4c257da2d1142871f508416d5f2227a',
-        mariadbJDBCVersion: '3.0.8',
-        mariadbJDBCSha256: '83697e1c44e77476123ab63cd8bb2ca96c1a349269f307c339f97caced2d0dd6'
+        mariadbJDBCVersion: '3.0.9',
+        mariadbJDBCSha256: '2a004c8ab43173a2a0d10d25aadfc57b8012fe1f68bbd816196df814b5000c1a'
     ]
 ]
 
-- 
GitLab