From 929e25ced230a060e552714145c30cf12374ccfd Mon Sep 17 00:00:00 2001
From: Adel Atallah <2213999+atallahade@users.noreply.github.com>
Date: Tue, 15 Jan 2019 15:21:54 +0100
Subject: [PATCH] XDOCKER-94: Upgrade stable version to 10.11.1
---
10/mysql-tomcat/.env | 2 +-
10/mysql-tomcat/Dockerfile | 4 ++--
10/postgres-tomcat/.env | 2 +-
10/postgres-tomcat/Dockerfile | 4 ++--
build.gradle | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/10/mysql-tomcat/.env b/10/mysql-tomcat/.env
index 50c95f0..01def0a 100644
--- a/10/mysql-tomcat/.env
+++ b/10/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=10.11
+XWIKI_VERSION=10.11.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile
index fba90f2..748555c 100644
--- a/10/mysql-tomcat/Dockerfile
+++ b/10/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=10.11
+ENV XWIKI_VERSION=10.11.1
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 e926bbb7c339d3308c6b11d2c2699a072fc535aeba5c18a30c6f9c10fe395ec7
+ENV XWIKI_DOWNLOAD_SHA256 5bebaa5949b716105b9afc3eac0a0d50e2f4b1d2edaca28e7b9fed00bad24d68
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/10/postgres-tomcat/.env b/10/postgres-tomcat/.env
index d14cf66..66b4bf4 100644
--- a/10/postgres-tomcat/.env
+++ b/10/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=10.11
+XWIKI_VERSION=10.11.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile
index 8844e4b..bd18c39 100644
--- a/10/postgres-tomcat/Dockerfile
+++ b/10/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=10.11
+ENV XWIKI_VERSION=10.11.1
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 e926bbb7c339d3308c6b11d2c2699a072fc535aeba5c18a30c6f9c10fe395ec7
+ENV XWIKI_DOWNLOAD_SHA256 5bebaa5949b716105b9afc3eac0a0d50e2f4b1d2edaca28e7b9fed00bad24d68
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 9173889..adcd4c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: 'e7b6f563012349dad2051fa7bb2ba5a5c2e736d11fcc41363a6acde16a4c128c'
],
'10': [
- xwikiVersion: '10.11',
- xwikiSha256: 'e926bbb7c339d3308c6b11d2c2699a072fc535aeba5c18a30c6f9c10fe395ec7'
+ xwikiVersion: '10.11.1',
+ xwikiSha256: '5bebaa5949b716105b9afc3eac0a0d50e2f4b1d2edaca28e7b9fed00bad24d68'
]
]
--
GitLab