From d8345864beb5ae56be55d99d7328fee3fc0e1f2b Mon Sep 17 00:00:00 2001
From: Eduard Moraru <Enygma2002@gmail.com>
Date: Thu, 21 Jun 2018 20:28:26 +0300
Subject: [PATCH] XDOCKER-61: Upgrade stable version to 10.5
---
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 586f2e3..f05167d 100644
--- a/10/mysql-tomcat/.env
+++ b/10/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=10.4
+XWIKI_VERSION=10.5
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile
index 86dc5f7..6afbf25 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.4
+ENV XWIKI_VERSION=10.5
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 4e9575813cb8e3c5c6fcb76f7a2df8bb6d0ec36b188235b37612184cb7b56a1a
+ENV XWIKI_DOWNLOAD_SHA256 e49addc6ef33bfbb8ef6587418a5e122329fbb81bc3fd272b1bf0e4805071e96
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 5a310bb..7fa0931 100644
--- a/10/postgres-tomcat/.env
+++ b/10/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=10.4
+XWIKI_VERSION=10.5
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile
index 9e33206..997f99d 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.4
+ENV XWIKI_VERSION=10.5
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 4e9575813cb8e3c5c6fcb76f7a2df8bb6d0ec36b188235b37612184cb7b56a1a
+ENV XWIKI_DOWNLOAD_SHA256 e49addc6ef33bfbb8ef6587418a5e122329fbb81bc3fd272b1bf0e4805071e96
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 9345792..702d212 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: '177fd372acf0006e3899fb6d116b885f01fc0fb71f7426d139435f6d07872192'
],
'10': [
- xwikiVersion: '10.4',
- xwikiSha256: '4e9575813cb8e3c5c6fcb76f7a2df8bb6d0ec36b188235b37612184cb7b56a1a'
+ xwikiVersion: '10.5',
+ xwikiSha256: 'e49addc6ef33bfbb8ef6587418a5e122329fbb81bc3fd272b1bf0e4805071e96'
]
]
--
GitLab