From d59d719dd80977ba9ae0e95e7806e93b65aed479 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Tue, 29 Aug 2023 10:49:05 +0200
Subject: [PATCH] XDOCKER-287: Upgrade LTS version to 15.7

---
 15/mariadb-tomcat/.env        | 2 +-
 15/mariadb-tomcat/Dockerfile  | 4 ++--
 15/mysql-tomcat/.env          | 2 +-
 15/mysql-tomcat/Dockerfile    | 4 ++--
 15/postgres-tomcat/.env       | 2 +-
 15/postgres-tomcat/Dockerfile | 4 ++--
 build.gradle                  | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/15/mariadb-tomcat/.env b/15/mariadb-tomcat/.env
index 37f25b2..73cd354 100644
--- a/15/mariadb-tomcat/.env
+++ b/15/mariadb-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=15.6
+XWIKI_VERSION=15.7
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/15/mariadb-tomcat/Dockerfile b/15/mariadb-tomcat/Dockerfile
index e30ac42..7989bbb 100644
--- a/15/mariadb-tomcat/Dockerfile
+++ b/15/mariadb-tomcat/Dockerfile
@@ -48,9 +48,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="15.6"
+ENV XWIKI_VERSION="15.7"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 024f0f2d5c4dbc5bdad00f2dca260a5aad5cd820812b3ba6088a730cbe4f84cd
+ENV XWIKI_DOWNLOAD_SHA256 f4c725d1b5b184693cec0477910d0a238747265820aade23961d6578f7000b64
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/15/mysql-tomcat/.env b/15/mysql-tomcat/.env
index 37f25b2..73cd354 100644
--- a/15/mysql-tomcat/.env
+++ b/15/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=15.6
+XWIKI_VERSION=15.7
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/15/mysql-tomcat/Dockerfile b/15/mysql-tomcat/Dockerfile
index 2ea8551..0ff9fe0 100644
--- a/15/mysql-tomcat/Dockerfile
+++ b/15/mysql-tomcat/Dockerfile
@@ -48,9 +48,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="15.6"
+ENV XWIKI_VERSION="15.7"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 024f0f2d5c4dbc5bdad00f2dca260a5aad5cd820812b3ba6088a730cbe4f84cd
+ENV XWIKI_DOWNLOAD_SHA256 f4c725d1b5b184693cec0477910d0a238747265820aade23961d6578f7000b64
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/15/postgres-tomcat/.env b/15/postgres-tomcat/.env
index 7c61677..015af73 100644
--- a/15/postgres-tomcat/.env
+++ b/15/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=15.6
+XWIKI_VERSION=15.7
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/15/postgres-tomcat/Dockerfile b/15/postgres-tomcat/Dockerfile
index 635f0c4..46f8a26 100644
--- a/15/postgres-tomcat/Dockerfile
+++ b/15/postgres-tomcat/Dockerfile
@@ -49,9 +49,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="15.6"
+ENV XWIKI_VERSION="15.7"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 024f0f2d5c4dbc5bdad00f2dca260a5aad5cd820812b3ba6088a730cbe4f84cd
+ENV XWIKI_DOWNLOAD_SHA256 f4c725d1b5b184693cec0477910d0a238747265820aade23961d6578f7000b64
 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 1b348b2..47f7b88 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,8 +44,8 @@ def variants = ['mysql-tomcat', 'mariadb-tomcat', 'postgres-tomcat']
 
 def tokens = [
     '15': [
-        xwikiVersion: '15.6',
-        xwikiSha256: '024f0f2d5c4dbc5bdad00f2dca260a5aad5cd820812b3ba6088a730cbe4f84cd',
+        xwikiVersion: '15.7',
+        xwikiSha256: 'f4c725d1b5b184693cec0477910d0a238747265820aade23961d6578f7000b64',
         mysqlJDBCVersion: '8.1.0',
         mysqlJDBCSha256: 'e2e657e9c5ebe06a73485c9739ebd8a18e7bebb852a58d0da287da850beca1c7',
         mariadbJDBCVersion: '3.2.0',
-- 
GitLab