From 057735e3adb74372847480d2fa65a6682155e51b Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Thu, 8 Apr 2021 15:23:43 +0200
Subject: [PATCH] XDOCKER-186: Deprecated 'com.mysql.jdbc.Driver' class warning
when using MySQL version 8 connector * Revert the MySQL upgrade because of
issues for 12.10.x and 13.2.x branches
---
12/mysql-tomcat/Dockerfile | 4 ++--
13/mysql-tomcat/Dockerfile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index fd4ba2d..f7a7b4f 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/mysql-tomcat/Dockerfile
@@ -57,8 +57,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.23"
-ENV MYSQL_JDBC_SHA256="ff7d5b402afd39c12787471505a33a304103b238ec1b7a44e8936d3329da7535"
+ENV MYSQL_JDBC_VERSION="8.0.22"
+ENV MYSQL_JDBC_SHA256="5019defbd12316295e97a6e88f2a9b07f118345a4e982710bba232e499b22f4f"
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/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile
index 8c02623..f35c923 100644
--- a/13/mysql-tomcat/Dockerfile
+++ b/13/mysql-tomcat/Dockerfile
@@ -57,8 +57,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.23"
-ENV MYSQL_JDBC_SHA256="ff7d5b402afd39c12787471505a33a304103b238ec1b7a44e8936d3329da7535"
+ENV MYSQL_JDBC_VERSION="8.0.22"
+ENV MYSQL_JDBC_SHA256="5019defbd12316295e97a6e88f2a9b07f118345a4e982710bba232e499b22f4f"
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}"
--
GitLab