From da38c291b3e953a4c94cfe25a2e2c6e0ffd4c7e8 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Mon, 25 Jul 2022 12:26:22 +0200
Subject: [PATCH] XDOCKER-243: Upgrade stable version to 14.6

---
 13/mariadb-tomcat/Dockerfile    | 4 ++--
 14.4/mariadb-tomcat/Dockerfile  | 6 +++---
 14.4/mysql-tomcat/Dockerfile    | 2 +-
 14.4/postgres-tomcat/Dockerfile | 2 +-
 14/mariadb-tomcat/.env          | 2 +-
 14/mariadb-tomcat/Dockerfile    | 8 ++++----
 14/mysql-tomcat/.env            | 2 +-
 14/mysql-tomcat/Dockerfile      | 4 ++--
 14/postgres-tomcat/.env         | 2 +-
 14/postgres-tomcat/Dockerfile   | 4 ++--
 build.gradle                    | 4 ++--
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/13/mariadb-tomcat/Dockerfile b/13/mariadb-tomcat/Dockerfile
index 3d0d28f..d8d2e0d 100644
--- a/13/mariadb-tomcat/Dockerfile
+++ b/13/mariadb-tomcat/Dockerfile
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MariaDB, download the MariaDB driver version from the Maven Central repository to control the version 
 # used.
-ENV MARIADB_JDBC_VERSION="3.0.5"
-ENV MARIADB_JDBC_SHA256="e9532d9bca07c1263c32b00b495bd3ec7f2b79320513cabd762bf39ea09e68d9"
+ENV MARIADB_JDBC_VERSION="3.0.6"
+ENV MARIADB_JDBC_SHA256="977ca7980b777b5aa8d32678204296a108f3eacbc4f210887e39b19869fad0d3"
 ENV MARIADB_JDBC_PREFIX="https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/${MARIADB_JDBC_VERSION}"
 ENV MARIADB_JDBC_ARTIFACT="mariadb-java-client-${MARIADB_JDBC_VERSION}.jar"
 ENV MARIADB_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MARIADB_JDBC_ARTIFACT}"
diff --git a/14.4/mariadb-tomcat/Dockerfile b/14.4/mariadb-tomcat/Dockerfile
index 9dbb103..4d9209e 100644
--- a/14.4/mariadb-tomcat/Dockerfile
+++ b/14.4/mariadb-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jre11
+FROM tomcat:9-jre11-openjdk
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MariaDB, download the MariaDB driver version from the Maven Central repository to control the version 
 # used.
-ENV MARIADB_JDBC_VERSION="3.0.5"
-ENV MARIADB_JDBC_SHA256="e9532d9bca07c1263c32b00b495bd3ec7f2b79320513cabd762bf39ea09e68d9"
+ENV MARIADB_JDBC_VERSION="3.0.6"
+ENV MARIADB_JDBC_SHA256="977ca7980b777b5aa8d32678204296a108f3eacbc4f210887e39b19869fad0d3"
 ENV MARIADB_JDBC_PREFIX="https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/${MARIADB_JDBC_VERSION}"
 ENV MARIADB_JDBC_ARTIFACT="mariadb-java-client-${MARIADB_JDBC_VERSION}.jar"
 ENV MARIADB_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MARIADB_JDBC_ARTIFACT}"
diff --git a/14.4/mysql-tomcat/Dockerfile b/14.4/mysql-tomcat/Dockerfile
index f75b058..b63ca44 100644
--- a/14.4/mysql-tomcat/Dockerfile
+++ b/14.4/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jre11
+FROM tomcat:9-jre11-openjdk
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/14.4/postgres-tomcat/Dockerfile b/14.4/postgres-tomcat/Dockerfile
index 7cf8a65..d6599b9 100644
--- a/14.4/postgres-tomcat/Dockerfile
+++ b/14.4/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jre11
+FROM tomcat:9-jre11-openjdk
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/14/mariadb-tomcat/.env b/14/mariadb-tomcat/.env
index 5f64d1e..01e53aa 100644
--- a/14/mariadb-tomcat/.env
+++ b/14/mariadb-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=14.5
+XWIKI_VERSION=14.6
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile
index 8819d7e..a53b1da 100644
--- a/14/mariadb-tomcat/Dockerfile
+++ b/14/mariadb-tomcat/Dockerfile
@@ -48,9 +48,9 @@ RUN apt-get update && \
 # Install XWiki as the ROOT webapp context in Tomcat
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
-ENV XWIKI_VERSION="14.5"
+ENV XWIKI_VERSION="14.6"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 fdf6397ebb0036920953d5e7f6d3896b3b8744517b8f00822c31380c24a3e170
+ENV XWIKI_DOWNLOAD_SHA256 9676cc9eeae3cf47bccae037bff67ce2468e3bec1d126f903b4d3fe61bff8723
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
 # Copy the JDBC driver in the XWiki webapp
 # For MariaDB, download the MariaDB driver version from the Maven Central repository to control the version 
 # used.
-ENV MARIADB_JDBC_VERSION="3.0.5"
-ENV MARIADB_JDBC_SHA256="e9532d9bca07c1263c32b00b495bd3ec7f2b79320513cabd762bf39ea09e68d9"
+ENV MARIADB_JDBC_VERSION="3.0.6"
+ENV MARIADB_JDBC_SHA256="977ca7980b777b5aa8d32678204296a108f3eacbc4f210887e39b19869fad0d3"
 ENV MARIADB_JDBC_PREFIX="https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/${MARIADB_JDBC_VERSION}"
 ENV MARIADB_JDBC_ARTIFACT="mariadb-java-client-${MARIADB_JDBC_VERSION}.jar"
 ENV MARIADB_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MARIADB_JDBC_ARTIFACT}"
diff --git a/14/mysql-tomcat/.env b/14/mysql-tomcat/.env
index 5f64d1e..01e53aa 100644
--- a/14/mysql-tomcat/.env
+++ b/14/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=14.5
+XWIKI_VERSION=14.6
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile
index 948252c..11f8ff6 100644
--- a/14/mysql-tomcat/Dockerfile
+++ b/14/mysql-tomcat/Dockerfile
@@ -48,9 +48,9 @@ RUN apt-get update && \
 # Install XWiki as the ROOT webapp context in Tomcat
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
-ENV XWIKI_VERSION="14.5"
+ENV XWIKI_VERSION="14.6"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 fdf6397ebb0036920953d5e7f6d3896b3b8744517b8f00822c31380c24a3e170
+ENV XWIKI_DOWNLOAD_SHA256 9676cc9eeae3cf47bccae037bff67ce2468e3bec1d126f903b4d3fe61bff8723
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/14/postgres-tomcat/.env b/14/postgres-tomcat/.env
index fcbfe24..e7357f2 100644
--- a/14/postgres-tomcat/.env
+++ b/14/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=14.5
+XWIKI_VERSION=14.6
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/14/postgres-tomcat/Dockerfile b/14/postgres-tomcat/Dockerfile
index 4e23cb6..6462d4f 100644
--- a/14/postgres-tomcat/Dockerfile
+++ b/14/postgres-tomcat/Dockerfile
@@ -49,9 +49,9 @@ RUN apt-get update && \
 # Install XWiki as the ROOT webapp context in Tomcat
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
-ENV XWIKI_VERSION="14.5"
+ENV XWIKI_VERSION="14.6"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 fdf6397ebb0036920953d5e7f6d3896b3b8744517b8f00822c31380c24a3e170
+ENV XWIKI_DOWNLOAD_SHA256 9676cc9eeae3cf47bccae037bff67ce2468e3bec1d126f903b4d3fe61bff8723
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/build.gradle b/build.gradle
index 3ccb371..e3cf33d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,8 +43,8 @@ def variants = ['mysql-tomcat', 'mariadb-tomcat', 'postgres-tomcat']
 
 def tokens = [
     '14': [
-        xwikiVersion: '14.5',
-        xwikiSha256: 'fdf6397ebb0036920953d5e7f6d3896b3b8744517b8f00822c31380c24a3e170',
+        xwikiVersion: '14.6',
+        xwikiSha256: '9676cc9eeae3cf47bccae037bff67ce2468e3bec1d126f903b4d3fe61bff8723',
         mysqlJDBCVersion: '8.0.29',
         mysqlJDBCSha256: 'd4e32d2a6026b5acc00300b73a86c28fb92681ae9629b21048ee67014c911db6',
         mariadbJDBCVersion: '3.0.6',
-- 
GitLab