From 879f62fee11cec2720eb011666845e0f66bd5290 Mon Sep 17 00:00:00 2001
From: Manuel Leduc <manuel.leduc@xwiki.com>
Date: Thu, 31 Mar 2022 13:53:53 +0200
Subject: [PATCH] XDOCKER-227: Upgrade to MariaDB 3.0.4
---
14/mariadb-tomcat/Dockerfile | 4 ++--
build.gradle | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile
index 3496fc4..401777f 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.3"
-ENV MARIADB_JDBC_SHA256="613086a0a20f177dfcf5e227f519272bc6be88bde4011de0f23c533231a7ae05"
+ENV MARIADB_JDBC_VERSION="3.0.4"
+ENV MARIADB_JDBC_SHA256="c8c9eba4f5368e3fdb321e17353446cbf8d36c822ec604841308b1bef950a529"
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 88f7d08..4f8f3df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,8 +47,8 @@ def tokens = [
xwikiSha256: '41d94b39d2f3c8e2c2e35a04465eacb70045a8252ef34b9eb13aaa5f1fa68bc1',
mysqlJDBCVersion: '8.0.28',
mysqlJDBCSha256: 'a00ccdf537ff50e50067b989108c2235197ffb65e197149bbb669db843cd1c3e',
- mariadbJDBCVersion: '3.0.3',
- mariadbJDBCSha256: '613086a0a20f177dfcf5e227f519272bc6be88bde4011de0f23c533231a7ae05'
+ mariadbJDBCVersion: '3.0.4',
+ mariadbJDBCSha256: 'c8c9eba4f5368e3fdb321e17353446cbf8d36c822ec604841308b1bef950a529'
],
'13': [
xwikiVersion: '13.10.4',
--
GitLab