From fe4b18db7cb02ca673346451b0828e29d70c9847 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Mon, 8 Aug 2022 13:16:13 +0200
Subject: [PATCH] XWIKI-20026: Upgrade to MySQL connector 8.0.30

---
 13/mysql-tomcat/Dockerfile   |  4 ++--
 14.4/mysql-tomcat/Dockerfile |  4 ++--
 14/mysql-tomcat/Dockerfile   |  4 ++--
 build.gradle                 | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile
index 77862aa..6975f10 100644
--- a/13/mysql-tomcat/Dockerfile
+++ b/13/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.29"
-ENV MYSQL_JDBC_SHA256="d4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6"
+ENV MYSQL_JDBC_VERSION="8.0.30"
+ENV MYSQL_JDBC_SHA256="b5bf2f0987197c30adf74a9e419b89cda4c257da2d1142871f508416d5f2227a"
 ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}"
 ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar"
 ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"
diff --git a/14.4/mysql-tomcat/Dockerfile b/14.4/mysql-tomcat/Dockerfile
index 394141f..d5a1df3 100644
--- a/14.4/mysql-tomcat/Dockerfile
+++ b/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.29"
-ENV MYSQL_JDBC_SHA256="d4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6"
+ENV MYSQL_JDBC_VERSION="8.0.30"
+ENV MYSQL_JDBC_SHA256="b5bf2f0987197c30adf74a9e419b89cda4c257da2d1142871f508416d5f2227a"
 ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}"
 ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar"
 ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"
diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile
index 11f8ff6..0cf89f1 100644
--- a/14/mysql-tomcat/Dockerfile
+++ b/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.29"
-ENV MYSQL_JDBC_SHA256="d4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6"
+ENV MYSQL_JDBC_VERSION="8.0.30"
+ENV MYSQL_JDBC_SHA256="b5bf2f0987197c30adf74a9e419b89cda4c257da2d1142871f508416d5f2227a"
 ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}"
 ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar"
 ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"
diff --git a/build.gradle b/build.gradle
index 0f88c9c..931c54e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,24 +45,24 @@ def tokens = [
     '14': [
         xwikiVersion: '14.6',
         xwikiSha256: '9676cc9eeae3cf47bccae037bff67ce2468e3bec1d126f903b4d3fe61bff8723',
-        mysqlJDBCVersion: '8.0.29',
-        mysqlJDBCSha256: 'd4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6',
+        mysqlJDBCVersion: '8.0.30',
+        mysqlJDBCSha256: 'b5bf2f0987197c30adf74a9e419b89cda4c257da2d1142871f508416d5f2227a',
         mariadbJDBCVersion: '3.0.7',
         mariadbJDBCSha256: '96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef'
     ],
     '14.4': [
         xwikiVersion: '14.4.3',
         xwikiSha256: '3c1bf65190a9603538180bb01a7a8f178e298899ccf1502022f79db29f0c4bf8',
-        mysqlJDBCVersion: '8.0.29',
-        mysqlJDBCSha256: 'd4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6',
+        mysqlJDBCVersion: '8.0.30',
+        mysqlJDBCSha256: 'b5bf2f0987197c30adf74a9e419b89cda4c257da2d1142871f508416d5f2227a',
         mariadbJDBCVersion: '3.0.7',
         mariadbJDBCSha256: '96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef'
     ],
     '13': [
         xwikiVersion: '13.10.8',
         xwikiSha256: 'd6da0bdfb5e0c9e5acccd13a9ff2d40a5bda2a3f9db4426f58fe8f47c262f4b7',
-        mysqlJDBCVersion: '8.0.29',
-        mysqlJDBCSha256: 'd4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6',
+        mysqlJDBCVersion: '8.0.30',
+        mysqlJDBCSha256: 'b5bf2f0987197c30adf74a9e419b89cda4c257da2d1142871f508416d5f2227a',
         mariadbJDBCVersion: '3.0.7',
         mariadbJDBCSha256: '96c7bb2e6228ccbdf88dd4b071346979fa1216196a24aca3d1fb9e4199698bef'
     ]
-- 
GitLab