XWIKI-20576: Upgrade to MySQL connector 8.0.32

XWIKI-20587: Upgrade to MariaDB connector 3.1.2

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.1"
-ENV MARIADB_JDBC_SHA256="a554541fd88047905fb0c4c10e1d85295f5e38c7bb5fb408b425392a79fc26e3"
+ENV MARIADB_JDBC_VERSION="3.1.2"
+ENV MARIADB_JDBC_SHA256="aaec1ad348d030a65b25c93c65cdaf472bf8b4b6b314b965e5ba13aec81bc622"
 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}"

14.4/mysql-tomcat/Dockerfile

@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to 
 # date Debian repository for it anymore.
-ENV MYSQL_JDBC_VERSION="8.0.31"
-ENV MYSQL_JDBC_SHA256="5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f"
+ENV MYSQL_JDBC_VERSION="8.0.32"
+ENV MYSQL_JDBC_SHA256="522329fe925980f02e5eb89b59d227245d345415ff0c08932a68c9765c13acc5"
 ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/${MYSQL_JDBC_VERSION}"
 ENV MYSQL_JDBC_ARTIFACT="mysql-connector-j-${MYSQL_JDBC_VERSION}.jar"
 ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"

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.1"
-ENV MARIADB_JDBC_SHA256="a554541fd88047905fb0c4c10e1d85295f5e38c7bb5fb408b425392a79fc26e3"
+ENV MARIADB_JDBC_VERSION="3.1.2"
+ENV MARIADB_JDBC_SHA256="aaec1ad348d030a65b25c93c65cdaf472bf8b4b6b314b965e5ba13aec81bc622"
 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}"

14/mysql-tomcat/Dockerfile

@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to 
 # date Debian repository for it anymore.
-ENV MYSQL_JDBC_VERSION="8.0.31"
-ENV MYSQL_JDBC_SHA256="5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f"
+ENV MYSQL_JDBC_VERSION="8.0.32"
+ENV MYSQL_JDBC_SHA256="522329fe925980f02e5eb89b59d227245d345415ff0c08932a68c9765c13acc5"
 ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/${MYSQL_JDBC_VERSION}"
 ENV MYSQL_JDBC_ARTIFACT="mysql-connector-j-${MYSQL_JDBC_VERSION}.jar"
 ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"

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.1"
-ENV MARIADB_JDBC_SHA256="a554541fd88047905fb0c4c10e1d85295f5e38c7bb5fb408b425392a79fc26e3"
+ENV MARIADB_JDBC_VERSION="3.1.2"
+ENV MARIADB_JDBC_SHA256="aaec1ad348d030a65b25c93c65cdaf472bf8b4b6b314b965e5ba13aec81bc622"
 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}"

15/mysql-tomcat/Dockerfile

@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to 
 # date Debian repository for it anymore.
-ENV MYSQL_JDBC_VERSION="8.0.31"
-ENV MYSQL_JDBC_SHA256="5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f"
+ENV MYSQL_JDBC_VERSION="8.0.32"
+ENV MYSQL_JDBC_SHA256="522329fe925980f02e5eb89b59d227245d345415ff0c08932a68c9765c13acc5"
 ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/${MYSQL_JDBC_VERSION}"
 ENV MYSQL_JDBC_ARTIFACT="mysql-connector-j-${MYSQL_JDBC_VERSION}.jar"
 ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"

build.gradle

@@ -45,26 +45,26 @@ def tokens = [
     '15': [
         xwikiVersion: '15.0',
         xwikiSha256: '79ba0f479bbc49521c113821adc9d91141075a9470d7f9bbb6994ca59c30d121',
-        mysqlJDBCVersion: '8.0.31',
-        mysqlJDBCSha256: '5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f',
-        mariadbJDBCVersion: '3.1.1',
-        mariadbJDBCSha256: 'a554541fd88047905fb0c4c10e1d85295f5e38c7bb5fb408b425392a79fc26e3'
+        mysqlJDBCVersion: '8.0.32',
+        mysqlJDBCSha256: '522329fe925980f02e5eb89b59d227245d345415ff0c08932a68c9765c13acc5',
+        mariadbJDBCVersion: '3.1.2',
+        mariadbJDBCSha256: 'aaec1ad348d030a65b25c93c65cdaf472bf8b4b6b314b965e5ba13aec81bc622'
     ],
     '14': [
         xwikiVersion: '14.10.4',
         xwikiSha256: '2fcfb622319172c2e424b9c11848ebfabe27cf8ef69cba39ceb5d124b7ebe713',
-        mysqlJDBCVersion: '8.0.31',
-        mysqlJDBCSha256: '5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f',
-        mariadbJDBCVersion: '3.1.1',
-        mariadbJDBCSha256: 'a554541fd88047905fb0c4c10e1d85295f5e38c7bb5fb408b425392a79fc26e3'
+        mysqlJDBCVersion: '8.0.32',
+        mysqlJDBCSha256: '522329fe925980f02e5eb89b59d227245d345415ff0c08932a68c9765c13acc5',
+        mariadbJDBCVersion: '3.1.2',
+        mariadbJDBCSha256: 'aaec1ad348d030a65b25c93c65cdaf472bf8b4b6b314b965e5ba13aec81bc622'
     ],
     '14.4': [
         xwikiVersion: '14.4.7',
         xwikiSha256: '4545869f5e088c88401556f473edf356ff9e358652edd766d2588e8164ef68e0',
-        mysqlJDBCVersion: '8.0.31',
-        mysqlJDBCSha256: '5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f',
-        mariadbJDBCVersion: '3.1.1',
-        mariadbJDBCSha256: 'a554541fd88047905fb0c4c10e1d85295f5e38c7bb5fb408b425392a79fc26e3'
+        mysqlJDBCVersion: '8.0.32',
+        mysqlJDBCSha256: '522329fe925980f02e5eb89b59d227245d345415ff0c08932a68c9765c13acc5',
+        mariadbJDBCVersion: '3.1.2',
+        mariadbJDBCSha256: 'aaec1ad348d030a65b25c93c65cdaf472bf8b4b6b314b965e5ba13aec81bc622'
     ]
 ]