From e103ef79423f83c27bacb27963148af11017d9b8 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Mon, 3 Oct 2022 15:37:17 +0200
Subject: [PATCH] XWIKI-20147: Upgrade to MariaDB connector 3.0.8

---
 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 414b613..fe69dfd 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.7"
-ENV MARIADB_JDBC_SHA256="96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef"
+ENV MARIADB_JDBC_VERSION="3.0.8"
+ENV MARIADB_JDBC_SHA256="83697e1c44e77476123ab63cd8bb2ca96c1a349269f307c339f97caced2d0dd6"
 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 d71fac8..9060d38 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.7"
-ENV MARIADB_JDBC_SHA256="96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef"
+ENV MARIADB_JDBC_VERSION="3.0.8"
+ENV MARIADB_JDBC_SHA256="83697e1c44e77476123ab63cd8bb2ca96c1a349269f307c339f97caced2d0dd6"
 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 f2aed20..7bd93f3 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.7"
-ENV MARIADB_JDBC_SHA256="96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef"
+ENV MARIADB_JDBC_VERSION="3.0.8"
+ENV MARIADB_JDBC_SHA256="83697e1c44e77476123ab63cd8bb2ca96c1a349269f307c339f97caced2d0dd6"
 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 b79197d..3f45f57 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,24 +47,24 @@ def tokens = [
         xwikiSha256: '87d2ffb0c5c179fe854e92b52707ee2a147d588b0fdf1bb0945657ce27163356',
         mysqlJDBCVersion: '8.0.30',
         mysqlJDBCSha256: 'b5bf2f0987197c30adf74a9e419b89cda4c257da2d1142871f508416d5f2227a',
-        mariadbJDBCVersion: '3.0.7',
-        mariadbJDBCSha256: '96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef'
+        mariadbJDBCVersion: '3.0.8',
+        mariadbJDBCSha256: '83697e1c44e77476123ab63cd8bb2ca96c1a349269f307c339f97caced2d0dd6'
     ],
     '14.4': [
         xwikiVersion: '14.4.5',
         xwikiSha256: 'a0fc9a83a4f2d2fb406fd4e0483492a82244c8fadfb9dc62f28574328c64d533',
         mysqlJDBCVersion: '8.0.30',
         mysqlJDBCSha256: 'b5bf2f0987197c30adf74a9e419b89cda4c257da2d1142871f508416d5f2227a',
-        mariadbJDBCVersion: '3.0.7',
-        mariadbJDBCSha256: '96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef'
+        mariadbJDBCVersion: '3.0.8',
+        mariadbJDBCSha256: '83697e1c44e77476123ab63cd8bb2ca96c1a349269f307c339f97caced2d0dd6'
     ],
     '13': [
         xwikiVersion: '13.10.9',
         xwikiSha256: 'ad57639016b1bfd1cdf84de764b310a65416832645c6bbfd933ec26fd977bb6a',
         mysqlJDBCVersion: '8.0.30',
         mysqlJDBCSha256: 'b5bf2f0987197c30adf74a9e419b89cda4c257da2d1142871f508416d5f2227a',
-        mariadbJDBCVersion: '3.0.7',
-        mariadbJDBCSha256: '96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef'
+        mariadbJDBCVersion: '3.0.8',
+        mariadbJDBCSha256: '83697e1c44e77476123ab63cd8bb2ca96c1a349269f307c339f97caced2d0dd6'
     ]
 ]
 
-- 
GitLab