From 899960b572c88c0f142e3791ffe6a2f572d5b925 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Tue, 2 May 2023 16:10:23 +0200
Subject: [PATCH] XWIKI-20893: Upgrade to MariaDB connector 3.1.4
---
14/mariadb-tomcat/Dockerfile | 4 ++--
15/mariadb-tomcat/Dockerfile | 4 ++--
build.gradle | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile
index b294257..dce3cd7 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.3"
-ENV MARIADB_JDBC_SHA256="11297ee6562426c49c81387c860153cbc131c4c3d042492d4f6d2d97ab3a1ca5"
+ENV MARIADB_JDBC_VERSION="3.1.4"
+ENV MARIADB_JDBC_SHA256="eb88b5d727d82e25117e2b6fabcec1daf734633b0a576456c73215884c189ad4"
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 daa7d6e..1b2bdb5 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.1.3"
-ENV MARIADB_JDBC_SHA256="11297ee6562426c49c81387c860153cbc131c4c3d042492d4f6d2d97ab3a1ca5"
+ENV MARIADB_JDBC_VERSION="3.1.4"
+ENV MARIADB_JDBC_SHA256="eb88b5d727d82e25117e2b6fabcec1daf734633b0a576456c73215884c189ad4"
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 8583639..7e5b74f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,16 +48,16 @@ def tokens = [
xwikiSha256: 'fbe35bcc5c6cc5764f2a1da4aca7878531f93bae069d94f399fea7d9656da3b8',
mysqlJDBCVersion: '8.0.33',
mysqlJDBCSha256: 'e2a3b2fc726a1ac64e998585db86b30fa8bf3f706195b78bb77c5f99bf877bd9',
- mariadbJDBCVersion: '3.1.3',
- mariadbJDBCSha256: '11297ee6562426c49c81387c860153cbc131c4c3d042492d4f6d2d97ab3a1ca5'
+ mariadbJDBCVersion: '3.1.4',
+ mariadbJDBCSha256: 'eb88b5d727d82e25117e2b6fabcec1daf734633b0a576456c73215884c189ad4'
],
'14': [
xwikiVersion: '14.10.9',
xwikiSha256: '81594962a2101d54866bccf768ea5b1637f836c57c5b212e221d043e96f5f35d',
mysqlJDBCVersion: '8.0.33',
mysqlJDBCSha256: 'e2a3b2fc726a1ac64e998585db86b30fa8bf3f706195b78bb77c5f99bf877bd9',
- mariadbJDBCVersion: '3.1.3',
- mariadbJDBCSha256: '11297ee6562426c49c81387c860153cbc131c4c3d042492d4f6d2d97ab3a1ca5'
+ mariadbJDBCVersion: '3.1.4',
+ mariadbJDBCSha256: 'eb88b5d727d82e25117e2b6fabcec1daf734633b0a576456c73215884c189ad4'
]
]
--
GitLab