From 6d3c21989350cc3ad57a0cc69861b78a0844d602 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Tue, 17 Jan 2023 15:41:57 +0100
Subject: [PATCH] XWIKI-20560: Upgrade to MariaDB connector 3.1.1
---
14.4/mariadb-tomcat/Dockerfile | 4 ++--
14/mariadb-tomcat/Dockerfile | 4 ++--
build.gradle | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/14.4/mariadb-tomcat/Dockerfile b/14.4/mariadb-tomcat/Dockerfile
index fd67420..84eb708 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.1.0"
-ENV MARIADB_JDBC_SHA256="bf78c92310a848b348f8478667f68fd17f8b80963c67474e8199f5abc8acbd50"
+ENV MARIADB_JDBC_VERSION="3.1.1"
+ENV MARIADB_JDBC_SHA256="a554541fd88047905fb0c4c10e1d85295f5e38c7bb5fb408b425392a79fc26e3"
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 0038213..006aafa 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.1.0"
-ENV MARIADB_JDBC_SHA256="bf78c92310a848b348f8478667f68fd17f8b80963c67474e8199f5abc8acbd50"
+ENV MARIADB_JDBC_VERSION="3.1.1"
+ENV MARIADB_JDBC_SHA256="a554541fd88047905fb0c4c10e1d85295f5e38c7bb5fb408b425392a79fc26e3"
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 039ea6e..a328184 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,16 +47,16 @@ def tokens = [
xwikiSha256: '62e21e356268ac50e16b54614e0c4a4c1ee0fc81f2e34b393464efdbcf1f5b1f',
mysqlJDBCVersion: '8.0.31',
mysqlJDBCSha256: '5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f',
- mariadbJDBCVersion: '3.1.0',
- mariadbJDBCSha256: 'bf78c92310a848b348f8478667f68fd17f8b80963c67474e8199f5abc8acbd50'
+ mariadbJDBCVersion: '3.1.1',
+ mariadbJDBCSha256: 'a554541fd88047905fb0c4c10e1d85295f5e38c7bb5fb408b425392a79fc26e3'
],
'14.4': [
xwikiVersion: '14.4.7',
xwikiSha256: '4545869f5e088c88401556f473edf356ff9e358652edd766d2588e8164ef68e0',
mysqlJDBCVersion: '8.0.31',
mysqlJDBCSha256: '5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f',
- mariadbJDBCVersion: '3.1.0',
- mariadbJDBCSha256: 'bf78c92310a848b348f8478667f68fd17f8b80963c67474e8199f5abc8acbd50'
+ mariadbJDBCVersion: '3.1.1',
+ mariadbJDBCSha256: 'a554541fd88047905fb0c4c10e1d85295f5e38c7bb5fb408b425392a79fc26e3'
],
'13': [
xwikiVersion: '13.10.11',
--
GitLab