From 8a2aadfed38c928726ea58d7a4b989b5601c4253 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Thu, 8 Apr 2021 15:23:01 +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
---
template/Dockerfile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/template/Dockerfile b/template/Dockerfile
index 53e4990..d80241e 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -62,10 +62,12 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \\
<% if (db == 'mysql') {
println "# For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to "
println "# date Debian repository for it anymore."
- println "ENV MYSQL_JDBC_VERSION=\"8.0.23\""
+ // Note: We currently cannot uprgade to 8.0.23 since we need all XWiki supported branches to have upgraded to
+ // liquibase 4.3.2 before we can upgrade, see https://jira.xwiki.org/browse/XWIKI-18515
+ println "ENV MYSQL_JDBC_VERSION=\"8.0.22\""
// Get the SHA256 from the JAR at https://search.maven.org/artifact/mysql/mysql-connector-java and using the
// command line defined in build.gradle.
- println "ENV MYSQL_JDBC_SHA256=\"ff7d5b402afd39c12787471505a33a304103b238ec1b7a44e8936d3329da7535\""
+ println "ENV MYSQL_JDBC_SHA256=\"5019defbd12316295e97a6e88f2a9b07f118345a4e982710bba232e499b22f4f\""
println "ENV MYSQL_JDBC_PREFIX=\"https://repo1.maven.org/maven2/mysql/mysql-connector-java/\${MYSQL_JDBC_VERSION}\""
println "ENV MYSQL_JDBC_ARTIFACT=\"mysql-connector-java-\${MYSQL_JDBC_VERSION}.jar\""
println "ENV MYSQL_JDBC_TARGET=\"/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/\${MYSQL_JDBC_ARTIFACT}\""
--
GitLab