From 5e67746d469fb430009fbac683b35ece8da2672a Mon Sep 17 00:00:00 2001
From: Eduard Moraru <Enygma2002@gmail.com>
Date: Mon, 29 Jun 2020 22:15:00 +0300
Subject: [PATCH] XDOCKER-144: Upgrade stable version to 12.5
---
12/mysql-tomcat/.env | 2 +-
12/mysql-tomcat/Dockerfile | 4 ++--
12/postgres-tomcat/.env | 2 +-
12/postgres-tomcat/Dockerfile | 4 ++--
build.gradle | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/12/mysql-tomcat/.env b/12/mysql-tomcat/.env
index 346ab07..321ac98 100644
--- a/12/mysql-tomcat/.env
+++ b/12/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.4
+XWIKI_VERSION=12.5
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 7153d54..aca1085 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/mysql-tomcat/Dockerfile
@@ -43,9 +43,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="12.4"
+ENV XWIKI_VERSION="12.5"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 f42fe7b84a323b0f637c0e9c60e885741821b2fd05f0196d4d41729d5888d2cc
+ENV XWIKI_DOWNLOAD_SHA256 59b8dc502d2706de10db2295e4d301c9983d9f09be497a8ea15ab5db2254e8d0
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/12/postgres-tomcat/.env b/12/postgres-tomcat/.env
index 7a37b2f..cfb3944 100644
--- a/12/postgres-tomcat/.env
+++ b/12/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.4
+XWIKI_VERSION=12.5
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index 3b317d1..ba5eb00 100644
--- a/12/postgres-tomcat/Dockerfile
+++ b/12/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="12.4"
+ENV XWIKI_VERSION="12.5"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 f42fe7b84a323b0f637c0e9c60e885741821b2fd05f0196d4d41729d5888d2cc
+ENV XWIKI_DOWNLOAD_SHA256 59b8dc502d2706de10db2295e4d301c9983d9f09be497a8ea15ab5db2254e8d0
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 44d89bd..0500ae0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: 'b08c8a9f0abbbf2bef5c61852688165dd4b2a9a7217da29047647e81c1ec3058'
],
'12': [
- xwikiVersion: '12.4',
- xwikiSha256: 'f42fe7b84a323b0f637c0e9c60e885741821b2fd05f0196d4d41729d5888d2cc'
+ xwikiVersion: '12.5',
+ xwikiSha256: '59b8dc502d2706de10db2295e4d301c9983d9f09be497a8ea15ab5db2254e8d0'
]
]
--
GitLab