From 55257cda96effe2bedc6ae5dd0e7cbeedda634f8 Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Fri, 3 Jul 2020 18:01:34 +0200
Subject: [PATCH] XDOCKER-147: Upgrade stable version to 12.5.1
---
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 321ac98..4b6202c 100644
--- a/12/mysql-tomcat/.env
+++ b/12/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.5
+XWIKI_VERSION=12.5.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index aca1085..7374786 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.5"
+ENV XWIKI_VERSION="12.5.1"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 59b8dc502d2706de10db2295e4d301c9983d9f09be497a8ea15ab5db2254e8d0
+ENV XWIKI_DOWNLOAD_SHA256 09d6bca7466cc70f7b78802209f391b2537757abfe14740fdb7d852470b22557
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 cfb3944..56fd30d 100644
--- a/12/postgres-tomcat/.env
+++ b/12/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.5
+XWIKI_VERSION=12.5.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index ba5eb00..6fb9af6 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.5"
+ENV XWIKI_VERSION="12.5.1"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 59b8dc502d2706de10db2295e4d301c9983d9f09be497a8ea15ab5db2254e8d0
+ENV XWIKI_DOWNLOAD_SHA256 09d6bca7466cc70f7b78802209f391b2537757abfe14740fdb7d852470b22557
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 0500ae0..2cfdbdf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: 'b08c8a9f0abbbf2bef5c61852688165dd4b2a9a7217da29047647e81c1ec3058'
],
'12': [
- xwikiVersion: '12.5',
- xwikiSha256: '59b8dc502d2706de10db2295e4d301c9983d9f09be497a8ea15ab5db2254e8d0'
+ xwikiVersion: '12.5.1',
+ xwikiSha256: '09d6bca7466cc70f7b78802209f391b2537757abfe14740fdb7d852470b22557'
]
]
--
GitLab