From 497c90e06826d42c4f7485699270981b5dcb287a Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Fri, 2 Apr 2021 11:30:40 +0200
Subject: [PATCH] XDOCKER-186: Deprecated 'com.mysql.jdbc.Driver' class warning
 when using MySQL version 8 connector * Also update the MySQL driver from
 8.0.22 to 8.0.23

---
 12/mysql-tomcat/Dockerfile              | 4 ++--
 12/mysql-tomcat/xwiki/hibernate.cfg.xml | 2 +-
 13/mysql-tomcat/Dockerfile              | 4 ++--
 13/mysql-tomcat/xwiki/hibernate.cfg.xml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index e9a2087..bc81d72 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.22"
-ENV MYSQL_JDBC_SHA256="5019defbd12316295e97a6e88f2a9b07f118345a4e982710bba232e499b22f4f"
+ENV MYSQL_JDBC_VERSION="8.0.23"
+ENV MYSQL_JDBC_SHA256="ff7d5b402afd39c12787471505a33a304103b238ec1b7a44e8936d3329da7535"
 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/12/mysql-tomcat/xwiki/hibernate.cfg.xml b/12/mysql-tomcat/xwiki/hibernate.cfg.xml
index 53793f2..06fd127 100644
--- a/12/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/12/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -86,7 +86,7 @@
     <property name="connection.url">jdbc:mysql://replacecontainer/replacedatabase?useSSL=false</property>
     <property name="connection.username">replaceuser</property>
     <property name="connection.password">replacepassword</property>
-    <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+    <property name="connection.driver_class">com.mysql.cj.jdbc.Driver</property>
     <property name="dbcp.poolPreparedStatements">true</property>
     <property name="dbcp.maxOpenPreparedStatements">20</property>
 
diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile
index f35c923..8c02623 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.22"
-ENV MYSQL_JDBC_SHA256="5019defbd12316295e97a6e88f2a9b07f118345a4e982710bba232e499b22f4f"
+ENV MYSQL_JDBC_VERSION="8.0.23"
+ENV MYSQL_JDBC_SHA256="ff7d5b402afd39c12787471505a33a304103b238ec1b7a44e8936d3329da7535"
 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/xwiki/hibernate.cfg.xml b/13/mysql-tomcat/xwiki/hibernate.cfg.xml
index 53793f2..06fd127 100644
--- a/13/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/13/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -86,7 +86,7 @@
     <property name="connection.url">jdbc:mysql://replacecontainer/replacedatabase?useSSL=false</property>
     <property name="connection.username">replaceuser</property>
     <property name="connection.password">replacepassword</property>
-    <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+    <property name="connection.driver_class">com.mysql.cj.jdbc.Driver</property>
     <property name="dbcp.poolPreparedStatements">true</property>
     <property name="dbcp.maxOpenPreparedStatements">20</property>
 
-- 
GitLab