From c4af6dbb515cd0d1d38846f8186bd001c1194e1d Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 4 Nov 2020 11:32:28 +0100
Subject: [PATCH] XDOCKER-164: Upgrade LTS version to 11.10.11
---
11/mysql-tomcat/.env | 2 +-
11/mysql-tomcat/Dockerfile | 8 ++++----
11/postgres-tomcat/.env | 2 +-
11/postgres-tomcat/Dockerfile | 4 ++--
12/mysql-tomcat/Dockerfile | 4 ++--
build.gradle | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/11/mysql-tomcat/.env b/11/mysql-tomcat/.env
index bbdc5bc..be8ba43 100644
--- a/11/mysql-tomcat/.env
+++ b/11/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=11.10.10
+XWIKI_VERSION=11.10.11
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/11/mysql-tomcat/Dockerfile b/11/mysql-tomcat/Dockerfile
index d5d5b3d..7e09545 100644
--- a/11/mysql-tomcat/Dockerfile
+++ b/11/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="11.10.10"
+ENV XWIKI_VERSION="11.10.11"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 497477c610b668bed7314c89bb0bde6dae4a0664404f4d4499e1d95d7eb94829
+ENV XWIKI_DOWNLOAD_SHA256 21845fe8eed97708b86c0a7050cd99710633d0d3ed5b1084358694e101bd353e
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
@@ -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.21"
-ENV MYSQL_JDBC_SHA256="2f62d886270a75ebc8e8fd89127d4a30ccc711f02256ade2cfb7090817132003"
+ENV MYSQL_JDBC_VERSION="8.0.22"
+ENV MYSQL_JDBC_SHA256="5019defbd12316295e97a6e88f2a9b07f118345a4e982710bba232e499b22f4f"
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/11/postgres-tomcat/.env b/11/postgres-tomcat/.env
index d789f49..8512214 100644
--- a/11/postgres-tomcat/.env
+++ b/11/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=11.10.10
+XWIKI_VERSION=11.10.11
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/11/postgres-tomcat/Dockerfile b/11/postgres-tomcat/Dockerfile
index 18094ec..7fe8450 100644
--- a/11/postgres-tomcat/Dockerfile
+++ b/11/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="11.10.10"
+ENV XWIKI_VERSION="11.10.11"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 497477c610b668bed7314c89bb0bde6dae4a0664404f4d4499e1d95d7eb94829
+ENV XWIKI_DOWNLOAD_SHA256 21845fe8eed97708b86c0a7050cd99710633d0d3ed5b1084358694e101bd353e
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 87048d8..6813ede 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.21"
-ENV MYSQL_JDBC_SHA256="2f62d886270a75ebc8e8fd89127d4a30ccc711f02256ade2cfb7090817132003"
+ENV MYSQL_JDBC_VERSION="8.0.22"
+ENV MYSQL_JDBC_SHA256="5019defbd12316295e97a6e88f2a9b07f118345a4e982710bba232e499b22f4f"
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/build.gradle b/build.gradle
index 58f4593..d93a2d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,8 +35,8 @@ def variants = ['mysql-tomcat', 'postgres-tomcat']
def tokens = [
'11': [
- xwikiVersion: '11.10.10',
- xwikiSha256: '497477c610b668bed7314c89bb0bde6dae4a0664404f4d4499e1d95d7eb94829'
+ xwikiVersion: '11.10.11',
+ xwikiSha256: '21845fe8eed97708b86c0a7050cd99710633d0d3ed5b1084358694e101bd353e'
],
'12': [
xwikiVersion: '12.9',
--
GitLab