From ced02a503e71cdd33a80e118a43e3d8d2983bc7e Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Mon, 26 Mar 2018 19:02:37 +0300
Subject: [PATCH] XDOCKER-55: Upgrade stable version to 10.2
---
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 7114939..1077d67 100644
--- a/10/mysql-tomcat/.env
+++ b/10/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=10.1
+XWIKI_VERSION=10.2
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile
index 5cac9ec..a02359e 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.1
+ENV XWIKI_VERSION=10.2
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 744d5ac88f1976fe5ac2a6a0d1dd9e2e0916d6657e7feb24063b6b657697167a
+ENV XWIKI_DOWNLOAD_SHA256 df0a7437adec83ba5830467d0fabe45ba44f91b29e17df116ebe388519fd3857
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 c3f601c..a01db3a 100644
--- a/10/postgres-tomcat/.env
+++ b/10/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=10.1
+XWIKI_VERSION=10.2
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile
index 1a1c749..30b533b 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.1
+ENV XWIKI_VERSION=10.2
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 744d5ac88f1976fe5ac2a6a0d1dd9e2e0916d6657e7feb24063b6b657697167a
+ENV XWIKI_DOWNLOAD_SHA256 df0a7437adec83ba5830467d0fabe45ba44f91b29e17df116ebe388519fd3857
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 b928491..21cbde4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: '40dcf3cd92580f4ef411b8d6d7e4454469e37a425408dff49f4a8b24917f2a48'
],
'10': [
- xwikiVersion: '10.1',
- xwikiSha256: '744d5ac88f1976fe5ac2a6a0d1dd9e2e0916d6657e7feb24063b6b657697167a'
+ xwikiVersion: '10.2',
+ xwikiSha256: 'df0a7437adec83ba5830467d0fabe45ba44f91b29e17df116ebe388519fd3857'
]
]
--
GitLab