From 71d038e83974df2290fafb78ade44846163ea3d7 Mon Sep 17 00:00:00 2001
From: Guillaume Delhumeau <guillaume.delhumeau@xwiki.com>
Date: Thu, 26 Mar 2020 18:24:16 +0100
Subject: [PATCH] XDOCKER-132: Upgrade stable version to 12.2.
---
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 4faa0b5..3f58c52 100644
--- a/12/mysql-tomcat/.env
+++ b/12/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.1
+XWIKI_VERSION=12.2
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 30c821d..c74eef7 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/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=12.1
+ENV XWIKI_VERSION=12.2
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 1cec854acc88ec27cb39bdb0ef376a68d2aab03944d951f64776c0462ff5bb40
+ENV XWIKI_DOWNLOAD_SHA256 185c64741737666d8266f66db82922a9bf9cdcfc6169922a221d3cd8fcb5fab3
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 1fc1aab..290ac86 100644
--- a/12/postgres-tomcat/.env
+++ b/12/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.1
+XWIKI_VERSION=12.2
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index cf54175..d75caea 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.1
+ENV XWIKI_VERSION=12.2
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 1cec854acc88ec27cb39bdb0ef376a68d2aab03944d951f64776c0462ff5bb40
+ENV XWIKI_DOWNLOAD_SHA256 185c64741737666d8266f66db82922a9bf9cdcfc6169922a221d3cd8fcb5fab3
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 f09545c..6d0cea9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: 'fc959c8641d772d90a53bc1976e86fab907d290364cd802b7b3e0304dcbf008b'
],
'12': [
- xwikiVersion: '12.1',
- xwikiSha256: '1cec854acc88ec27cb39bdb0ef376a68d2aab03944d951f64776c0462ff5bb40'
+ xwikiVersion: '12.2',
+ xwikiSha256: '185c64741737666d8266f66db82922a9bf9cdcfc6169922a221d3cd8fcb5fab3'
]
]
--
GitLab