From f38a721ba28a15b7fe386a1fb7545c0492c7beff Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Tue, 30 Jan 2024 10:44:10 +0100
Subject: [PATCH] XWIKI-21840: Upgrade to MySQL connector 8.3.0

---
 14/mysql-tomcat/Dockerfile   |  4 ++--
 15.5/mysql-tomcat/Dockerfile |  4 ++--
 15/mysql-tomcat/Dockerfile   |  4 ++--
 16/mysql-tomcat/Dockerfile   |  4 ++--
 build.gradle                 | 16 ++++++++--------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile
index 4c66d4e..3201c25 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.2.0"
-ENV MYSQL_JDBC_SHA256="06f14fbd664d0e382347489e66495ca27ab7e6c2e1d9969a496931736197465f"
+ENV MYSQL_JDBC_VERSION="8.3.0"
+ENV MYSQL_JDBC_SHA256="94e7fa815370cdcefed915db7f53f88445fac110f8c3818392b992ec9ee6d295"
 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}"
diff --git a/15.5/mysql-tomcat/Dockerfile b/15.5/mysql-tomcat/Dockerfile
index c412be5..1f7e279 100644
--- a/15.5/mysql-tomcat/Dockerfile
+++ b/15.5/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.2.0"
-ENV MYSQL_JDBC_SHA256="06f14fbd664d0e382347489e66495ca27ab7e6c2e1d9969a496931736197465f"
+ENV MYSQL_JDBC_VERSION="8.3.0"
+ENV MYSQL_JDBC_SHA256="94e7fa815370cdcefed915db7f53f88445fac110f8c3818392b992ec9ee6d295"
 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}"
diff --git a/15/mysql-tomcat/Dockerfile b/15/mysql-tomcat/Dockerfile
index 14f8f67..a238c33 100644
--- a/15/mysql-tomcat/Dockerfile
+++ b/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.2.0"
-ENV MYSQL_JDBC_SHA256="06f14fbd664d0e382347489e66495ca27ab7e6c2e1d9969a496931736197465f"
+ENV MYSQL_JDBC_VERSION="8.3.0"
+ENV MYSQL_JDBC_SHA256="94e7fa815370cdcefed915db7f53f88445fac110f8c3818392b992ec9ee6d295"
 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}"
diff --git a/16/mysql-tomcat/Dockerfile b/16/mysql-tomcat/Dockerfile
index 7145c7f..cfdf07b 100644
--- a/16/mysql-tomcat/Dockerfile
+++ b/16/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.2.0"
-ENV MYSQL_JDBC_SHA256="06f14fbd664d0e382347489e66495ca27ab7e6c2e1d9969a496931736197465f"
+ENV MYSQL_JDBC_VERSION="8.3.0"
+ENV MYSQL_JDBC_SHA256="94e7fa815370cdcefed915db7f53f88445fac110f8c3818392b992ec9ee6d295"
 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}"
diff --git a/build.gradle b/build.gradle
index 442ea18..e6f03a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,32 +46,32 @@ def tokens = [
     '16': [
         xwikiVersion: '16.0.0',
         xwikiSha256: '955c175d0ac0e7039eeafd8569d87ad8a7967092ad8d018decb80a42a7eb941f',
-        mysqlJDBCVersion: '8.2.0',
-        mysqlJDBCSha256: '06f14fbd664d0e382347489e66495ca27ab7e6c2e1d9969a496931736197465f',
+        mysqlJDBCVersion: '8.3.0',
+        mysqlJDBCSha256: '94e7fa815370cdcefed915db7f53f88445fac110f8c3818392b992ec9ee6d295',
         mariadbJDBCVersion: '3.3.2',
         mariadbJDBCSha256: '2a67ef3cc1ca481965a0e7f2d4174d126f3464d02b4055a441261fad8c196769'
     ],
     '15': [
         xwikiVersion: '15.10.5',
         xwikiSha256: '3775334377ae7fb8bcf6a21e6eb099a8cfbea43044dc0716c01cb3b5117988a2',
-        mysqlJDBCVersion: '8.2.0',
-        mysqlJDBCSha256: '06f14fbd664d0e382347489e66495ca27ab7e6c2e1d9969a496931736197465f',
+        mysqlJDBCVersion: '8.3.0',
+        mysqlJDBCSha256: '94e7fa815370cdcefed915db7f53f88445fac110f8c3818392b992ec9ee6d295',
         mariadbJDBCVersion: '3.3.2',
         mariadbJDBCSha256: '2a67ef3cc1ca481965a0e7f2d4174d126f3464d02b4055a441261fad8c196769'
     ],
     '15.5': [
         xwikiVersion: '15.5.4',
         xwikiSha256: '271159495bfe8461f209dc2674faef918b74e4c5a97edfc51e9608a419aa78e6',
-        mysqlJDBCVersion: '8.2.0',
-        mysqlJDBCSha256: '06f14fbd664d0e382347489e66495ca27ab7e6c2e1d9969a496931736197465f',
+        mysqlJDBCVersion: '8.3.0',
+        mysqlJDBCSha256: '94e7fa815370cdcefed915db7f53f88445fac110f8c3818392b992ec9ee6d295',
         mariadbJDBCVersion: '3.3.2',
         mariadbJDBCSha256: '2a67ef3cc1ca481965a0e7f2d4174d126f3464d02b4055a441261fad8c196769'
     ],
     '14': [
         xwikiVersion: '14.10.20',
         xwikiSha256: 'c418601676d61893ccb9e066b1f2bcce56717b49e5c2456656b6960db6bd6e4c',
-        mysqlJDBCVersion: '8.2.0',
-        mysqlJDBCSha256: '06f14fbd664d0e382347489e66495ca27ab7e6c2e1d9969a496931736197465f',
+        mysqlJDBCVersion: '8.3.0',
+        mysqlJDBCSha256: '94e7fa815370cdcefed915db7f53f88445fac110f8c3818392b992ec9ee6d295',
         mariadbJDBCVersion: '3.3.2',
         mariadbJDBCSha256: '2a67ef3cc1ca481965a0e7f2d4174d126f3464d02b4055a441261fad8c196769'
     ]
-- 
GitLab