From 577230dc36a7862be7608b6569c2841c952db890 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Fri, 25 Nov 2022 11:50:21 +0100
Subject: [PATCH] XWIKI-20253: Upgrade to MySQL connector 8.0.31 * fix MySQL
connector download URL
---
build.gradle | 4 ++--
template/Dockerfile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index 3ca4871..dbd1a81 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,10 +33,10 @@ def variants = ['mysql-tomcat', 'mariadb-tomcat', 'postgres-tomcat']
// - To compute the XWiki sha256, download the XWiki WAR and issue:
// - Unix: sha256sum <binary name>
// - Mac: shasum --algorithm 256 <binary name>
-// - To compute the mysql JDBC sha256, get the JAR at https://search.maven.org/artifact/com.mysql/mysql-connector-j and
+// - To compute the mysql JDBC sha256, get the JAR at https://search.maven.org/artifact/com/mysql/mysql-connector-j and
// do the same as for the XWiki sha256.
// - To compute the mysql JDBC sha256, get the JAR at
-// https://search.maven.org/artifact/org.mariadb.jdbc/mariadb-java-client and do the same as for the XWiki sha256.
+// https://search.maven.org/artifact/org/mariadb/jdbc/mariadb-java-client and do the same as for the XWiki sha256.
// - Use the JDBC driver versions found in the XWiki POM for the specified versions:
// - mysql: https://github.com/xwiki/xwiki-platform/blob/master/pom.xml#L101 (link for master)
// - mariadb: https://github.com/xwiki/xwiki-platform/blob/master/pom.xml#L104 (link for master)
diff --git a/template/Dockerfile b/template/Dockerfile
index 0f16233..80e343a 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -65,7 +65,7 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \\
println "# date Debian repository for it anymore."
println "ENV MYSQL_JDBC_VERSION=\"$mysqlJDBCVersion\""
println "ENV MYSQL_JDBC_SHA256=\"$mysqlJDBCSha256\""
- println "ENV MYSQL_JDBC_PREFIX=\"https://repo1.maven.org/maven2/com.mysql/mysql-connector-j/\${MYSQL_JDBC_VERSION}\""
+ println "ENV MYSQL_JDBC_PREFIX=\"https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/\${MYSQL_JDBC_VERSION}\""
println "ENV MYSQL_JDBC_ARTIFACT=\"mysql-connector-j-\${MYSQL_JDBC_VERSION}.jar\""
println "ENV MYSQL_JDBC_TARGET=\"/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/\${MYSQL_JDBC_ARTIFACT}\""
println "RUN curl -fSL \"\${MYSQL_JDBC_PREFIX}/\${MYSQL_JDBC_ARTIFACT}\" -o \$MYSQL_JDBC_TARGET && \\"
--
GitLab