From 0e00caf4065269a4ceca96b772b789cabcf48ece Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 3 Jan 2024 15:50:08 +0100
Subject: [PATCH] XDOCKER-306: Upgrade LTS version to 15.10.4

---
 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 7a31b51..629c38b 100644
--- a/15/mariadb-tomcat/.env
+++ b/15/mariadb-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=15.10.3
+XWIKI_VERSION=15.10.4
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/15/mariadb-tomcat/Dockerfile b/15/mariadb-tomcat/Dockerfile
index b5c8579..5ce3002 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.10.3"
+ENV XWIKI_VERSION="15.10.4"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 0c3b73fb2ed8c301edcb12b031307bd1242b3bcd2ebfb26cd583b09a0dd5088c
+ENV XWIKI_DOWNLOAD_SHA256 8c1bb157f03b714255305aadc0904d35e87ae38df998dcfb5117de3d395d473c
 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 7a31b51..629c38b 100644
--- a/15/mysql-tomcat/.env
+++ b/15/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=15.10.3
+XWIKI_VERSION=15.10.4
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/15/mysql-tomcat/Dockerfile b/15/mysql-tomcat/Dockerfile
index 0036963..2cd3f2b 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.10.3"
+ENV XWIKI_VERSION="15.10.4"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 0c3b73fb2ed8c301edcb12b031307bd1242b3bcd2ebfb26cd583b09a0dd5088c
+ENV XWIKI_DOWNLOAD_SHA256 8c1bb157f03b714255305aadc0904d35e87ae38df998dcfb5117de3d395d473c
 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 b7ad54b..5e570dd 100644
--- a/15/postgres-tomcat/.env
+++ b/15/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=15.10.3
+XWIKI_VERSION=15.10.4
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/15/postgres-tomcat/Dockerfile b/15/postgres-tomcat/Dockerfile
index 7024942..88ea217 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.10.3"
+ENV XWIKI_VERSION="15.10.4"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 0c3b73fb2ed8c301edcb12b031307bd1242b3bcd2ebfb26cd583b09a0dd5088c
+ENV XWIKI_DOWNLOAD_SHA256 8c1bb157f03b714255305aadc0904d35e87ae38df998dcfb5117de3d395d473c
 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 4c4e0c4..9b3b2eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,8 +44,8 @@ def variants = ['mysql-tomcat', 'mariadb-tomcat', 'postgres-tomcat']
 
 def tokens = [
     '15': [
-        xwikiVersion: '15.10.3',
-        xwikiSha256: '0c3b73fb2ed8c301edcb12b031307bd1242b3bcd2ebfb26cd583b09a0dd5088c',
+        xwikiVersion: '15.10.4',
+        xwikiSha256: '8c1bb157f03b714255305aadc0904d35e87ae38df998dcfb5117de3d395d473c',
         mysqlJDBCVersion: '8.2.0',
         mysqlJDBCSha256: '06f14fbd664d0e382347489e66495ca27ab7e6c2e1d9969a496931736197465f',
         mariadbJDBCVersion: '3.3.2',
-- 
GitLab