From 69a313c1eb83393d070f6d1f40f63745856c7b80 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Mon, 20 Nov 2017 18:20:45 +0100
Subject: [PATCH] XDOCKER-37: Upgrade stable version to 9.10
---
9/mysql-tomcat/.env | 2 +-
9/mysql-tomcat/Dockerfile | 4 ++--
9/postgres-tomcat/.env | 2 +-
9/postgres-tomcat/Dockerfile | 4 ++--
build.gradle | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/9/mysql-tomcat/.env b/9/mysql-tomcat/.env
index d5696bf..773ee9c 100644
--- a/9/mysql-tomcat/.env
+++ b/9/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=9.9
+XWIKI_VERSION=9.10
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile
index 013a950..76f5af9 100644
--- a/9/mysql-tomcat/Dockerfile
+++ b/9/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=9.9
+ENV XWIKI_VERSION=9.10
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 6141614d0cebcdec83b83642e94b0b8b70ed832e9b32db2c34c31549e546a3a9
+ENV XWIKI_DOWNLOAD_SHA256 a98c966e53721dfb770b9018d62476cdb1e92aa4eed894b4ab13747988b6dd64
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/9/postgres-tomcat/.env b/9/postgres-tomcat/.env
index 354edb0..24c2353 100644
--- a/9/postgres-tomcat/.env
+++ b/9/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=9.9
+XWIKI_VERSION=9.10
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile
index b10375e..cdcb340 100644
--- a/9/postgres-tomcat/Dockerfile
+++ b/9/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=9.9
+ENV XWIKI_VERSION=9.10
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 6141614d0cebcdec83b83642e94b0b8b70ed832e9b32db2c34c31549e546a3a9
+ENV XWIKI_DOWNLOAD_SHA256 a98c966e53721dfb770b9018d62476cdb1e92aa4eed894b4ab13747988b6dd64
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 72d1153..b0ee795 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: '52ed122c44984748a729a784c94cb70ccf0d2fa34c2340d0fd45c75deb3b0bc9'
],
'9' : [
- xwikiVersion: '9.9',
- xwikiSha256: '6141614d0cebcdec83b83642e94b0b8b70ed832e9b32db2c34c31549e546a3a9'
+ xwikiVersion: '9.10',
+ xwikiSha256: 'a98c966e53721dfb770b9018d62476cdb1e92aa4eed894b4ab13747988b6dd64'
]
]
--
GitLab