From ffa242a448fc2fd16b3be4d6ebe4f88437a0a7f8 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Mon, 28 Sep 2020 16:49:11 +0200
Subject: [PATCH] XDOCKER-160: Upgrade stable version to 12.8

---
 11/mysql-tomcat/Dockerfile    | 2 +-
 12/mysql-tomcat/.env          | 2 +-
 12/mysql-tomcat/Dockerfile    | 6 +++---
 12/postgres-tomcat/.env       | 2 +-
 12/postgres-tomcat/Dockerfile | 4 ++--
 build.gradle                  | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/11/mysql-tomcat/Dockerfile b/11/mysql-tomcat/Dockerfile
index 35c6e2a..3fd5ec5 100644
--- a/11/mysql-tomcat/Dockerfile
+++ b/11/mysql-tomcat/Dockerfile
@@ -57,7 +57,7 @@ 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.20"
+ENV MYSQL_JDBC_VERSION="8.0.21"
 ENV MYSQL_JDBC_SHA256="56a42553b516660ae0bcd08f7f4f5f375294afbd62200d6c0c88a8c61c668ede"
 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"
diff --git a/12/mysql-tomcat/.env b/12/mysql-tomcat/.env
index b32a2ad..95b2e1d 100644
--- a/12/mysql-tomcat/.env
+++ b/12/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=12.7.1
+XWIKI_VERSION=12.8
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 53df894..31753d5 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/mysql-tomcat/Dockerfile
@@ -43,9 +43,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="12.7.1"
+ENV XWIKI_VERSION="12.8"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 2486c6facdac4b0fc2f1ba8c4c415d6beab0899ae9997597a1684b0b4513a173
+ENV XWIKI_DOWNLOAD_SHA256 a1a7009d822a7903729150a43a05e08340cd210b7c7c9ee3b1f199530fb3d18d
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
@@ -57,7 +57,7 @@ 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.20"
+ENV MYSQL_JDBC_VERSION="8.0.21"
 ENV MYSQL_JDBC_SHA256="56a42553b516660ae0bcd08f7f4f5f375294afbd62200d6c0c88a8c61c668ede"
 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"
diff --git a/12/postgres-tomcat/.env b/12/postgres-tomcat/.env
index 146aacd..cd94d0c 100644
--- a/12/postgres-tomcat/.env
+++ b/12/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=12.7.1
+XWIKI_VERSION=12.8
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index 8df3e9f..f57bc51 100644
--- a/12/postgres-tomcat/Dockerfile
+++ b/12/postgres-tomcat/Dockerfile
@@ -44,9 +44,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="12.7.1"
+ENV XWIKI_VERSION="12.8"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 2486c6facdac4b0fc2f1ba8c4c415d6beab0899ae9997597a1684b0b4513a173
+ENV XWIKI_DOWNLOAD_SHA256 a1a7009d822a7903729150a43a05e08340cd210b7c7c9ee3b1f199530fb3d18d
 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 b23f42e..150f368 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
         xwikiSha256: '497477c610b668bed7314c89bb0bde6dae4a0664404f4d4499e1d95d7eb94829'
     ],
     '12': [
-        xwikiVersion: '12.7.1',
-        xwikiSha256: '2486c6facdac4b0fc2f1ba8c4c415d6beab0899ae9997597a1684b0b4513a173'
+        xwikiVersion: '12.8',
+        xwikiSha256: 'a1a7009d822a7903729150a43a05e08340cd210b7c7c9ee3b1f199530fb3d18d'
     ]
 ]
 
-- 
GitLab