From e03642ba300b060d432a1faedb8d71835c7c364e Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Mon, 8 Aug 2022 13:14:25 +0200
Subject: [PATCH] XWIKI-20056: Upgrade to MariaDB connector 3.0.7

---
 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 6d5449f..0661ba7 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.6"
-ENV MARIADB_JDBC_SHA256="977ca7980b777b5aa8d32678204296a108f3eacbc4f210887e39b19869fad0d3"
+ENV MARIADB_JDBC_VERSION="3.0.7"
+ENV MARIADB_JDBC_SHA256="96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef"
 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 09d3409..b8c636c 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.6"
-ENV MARIADB_JDBC_SHA256="977ca7980b777b5aa8d32678204296a108f3eacbc4f210887e39b19869fad0d3"
+ENV MARIADB_JDBC_VERSION="3.0.7"
+ENV MARIADB_JDBC_SHA256="96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef"
 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 a53b1da..f87de1f 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.6"
-ENV MARIADB_JDBC_SHA256="977ca7980b777b5aa8d32678204296a108f3eacbc4f210887e39b19869fad0d3"
+ENV MARIADB_JDBC_VERSION="3.0.7"
+ENV MARIADB_JDBC_SHA256="96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef"
 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 6b72695..0f88c9c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,24 +47,24 @@ def tokens = [
         xwikiSha256: '9676cc9eeae3cf47bccae037bff67ce2468e3bec1d126f903b4d3fe61bff8723',
         mysqlJDBCVersion: '8.0.29',
         mysqlJDBCSha256: 'd4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6',
-        mariadbJDBCVersion: '3.0.6',
-        mariadbJDBCSha256: '977ca7980b777b5aa8d32678204296a108f3eacbc4f210887e39b19869fad0d3'
+        mariadbJDBCVersion: '3.0.7',
+        mariadbJDBCSha256: '96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef'
     ],
     '14.4': [
         xwikiVersion: '14.4.3',
         xwikiSha256: '3c1bf65190a9603538180bb01a7a8f178e298899ccf1502022f79db29f0c4bf8',
         mysqlJDBCVersion: '8.0.29',
         mysqlJDBCSha256: 'd4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6',
-        mariadbJDBCVersion: '3.0.6',
-        mariadbJDBCSha256: '977ca7980b777b5aa8d32678204296a108f3eacbc4f210887e39b19869fad0d3'
+        mariadbJDBCVersion: '3.0.7',
+        mariadbJDBCSha256: '96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef'
     ],
     '13': [
         xwikiVersion: '13.10.8',
         xwikiSha256: 'd6da0bdfb5e0c9e5acccd13a9ff2d40a5bda2a3f9db4426f58fe8f47c262f4b7',
         mysqlJDBCVersion: '8.0.29',
         mysqlJDBCSha256: 'd4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6',
-        mariadbJDBCVersion: '3.0.6',
-        mariadbJDBCSha256: '977ca7980b777b5aa8d32678204296a108f3eacbc4f210887e39b19869fad0d3'
+        mariadbJDBCVersion: '3.0.7',
+        mariadbJDBCSha256: '96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef'
     ]
 ]
 
-- 
GitLab