From b7f68214eb558c727dfead91552a29365f9ecea9 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Mon, 7 Aug 2017 10:09:33 +0200
Subject: [PATCH] XDOCKER-31: Upgrade stable version to 9.6
---
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 ad3705b..ee93b70 100644
--- a/9/mysql-tomcat/.env
+++ b/9/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=9.5.1
+XWIKI_VERSION=9.6
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile
index d862dc7..636e16a 100644
--- a/9/mysql-tomcat/Dockerfile
+++ b/9/mysql-tomcat/Dockerfile
@@ -42,9 +42,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.5.1
+ENV XWIKI_VERSION=9.6
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 0636314e46358bc59a2f1d80bae1958cd93db1ed5cd61ae857c6dd6e99e34fac
+ENV XWIKI_DOWNLOAD_SHA256 e702fc39a957d3567423ea91a5212c57b1c8c2fabe76a5b0f59e215b013cdb4c
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 bf4b5eb..4fdac8b 100644
--- a/9/postgres-tomcat/.env
+++ b/9/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=9.5.1
+XWIKI_VERSION=9.6
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile
index 3ece5c7..f597ee8 100644
--- a/9/postgres-tomcat/Dockerfile
+++ b/9/postgres-tomcat/Dockerfile
@@ -42,9 +42,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.5.1
+ENV XWIKI_VERSION=9.6
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 0636314e46358bc59a2f1d80bae1958cd93db1ed5cd61ae857c6dd6e99e34fac
+ENV XWIKI_DOWNLOAD_SHA256 e702fc39a957d3567423ea91a5212c57b1c8c2fabe76a5b0f59e215b013cdb4c
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 292076e..857d68d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: '52ed122c44984748a729a784c94cb70ccf0d2fa34c2340d0fd45c75deb3b0bc9'
],
'9' : [
- xwikiVersion: '9.5.1',
- xwikiSha256: '0636314e46358bc59a2f1d80bae1958cd93db1ed5cd61ae857c6dd6e99e34fac'
+ xwikiVersion: '9.6',
+ xwikiSha256: 'e702fc39a957d3567423ea91a5212c57b1c8c2fabe76a5b0f59e215b013cdb4c'
]
]
--
GitLab