From cdbf86ef9a4bb8284987b16d437f37b69ea18d7e Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Mon, 25 Nov 2019 15:48:34 +0100
Subject: [PATCH] XDOCKER-123: Upgrade stable version to 11.10
---
11/mysql-tomcat/.env | 2 +-
11/mysql-tomcat/Dockerfile | 4 ++--
11/postgres-tomcat/.env | 2 +-
11/postgres-tomcat/Dockerfile | 4 ++--
build.gradle | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/11/mysql-tomcat/.env b/11/mysql-tomcat/.env
index 0ef8542..286b4ed 100644
--- a/11/mysql-tomcat/.env
+++ b/11/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=11.9
+XWIKI_VERSION=11.10
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/11/mysql-tomcat/Dockerfile b/11/mysql-tomcat/Dockerfile
index 6b5874c..7302c2f 100644
--- a/11/mysql-tomcat/Dockerfile
+++ b/11/mysql-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.9
+ENV XWIKI_VERSION=11.10
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 f4fc420b570c5da374492b236cca5df1239793979126722c1adcc642ee9b335c
+ENV XWIKI_DOWNLOAD_SHA256 793266765290a43776b73862773dd76106b496010969822f093b31e16e9c7a3e
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/11/postgres-tomcat/.env b/11/postgres-tomcat/.env
index ed4398a..178f995 100644
--- a/11/postgres-tomcat/.env
+++ b/11/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=11.9
+XWIKI_VERSION=11.10
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/11/postgres-tomcat/Dockerfile b/11/postgres-tomcat/Dockerfile
index 8da0659..5d6aed8 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.9
+ENV XWIKI_VERSION=11.10
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 f4fc420b570c5da374492b236cca5df1239793979126722c1adcc642ee9b335c
+ENV XWIKI_DOWNLOAD_SHA256 793266765290a43776b73862773dd76106b496010969822f093b31e16e9c7a3e
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 170abe9..d7abf27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: 'e1feedd24f0a27ba4e36464913a2fcb43a60f9310283a8a6be017a1979618bb7'
],
'11': [
- xwikiVersion: '11.9',
- xwikiSha256: 'f4fc420b570c5da374492b236cca5df1239793979126722c1adcc642ee9b335c'
+ xwikiVersion: '11.10',
+ xwikiSha256: '793266765290a43776b73862773dd76106b496010969822f093b31e16e9c7a3e'
]
]
--
GitLab