From 3602bfe1e853e42b2e2c193171f99036fdf0be61 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Mon, 20 Feb 2023 11:19:02 +0100
Subject: [PATCH] XDOCKER-266: Upgrade LTS version to 14.10.5
---
14/mariadb-tomcat/.env | 2 +-
14/mariadb-tomcat/Dockerfile | 4 ++--
14/mysql-tomcat/.env | 2 +-
14/mysql-tomcat/Dockerfile | 4 ++--
14/postgres-tomcat/.env | 2 +-
14/postgres-tomcat/Dockerfile | 4 ++--
build.gradle | 7 ++++---
7 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/14/mariadb-tomcat/.env b/14/mariadb-tomcat/.env
index 0e7475f..6365358 100644
--- a/14/mariadb-tomcat/.env
+++ b/14/mariadb-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=14.10.4
+XWIKI_VERSION=14.10.5
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile
index 4bacbe7..582fc8e 100644
--- a/14/mariadb-tomcat/Dockerfile
+++ b/14/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="14.10.4"
+ENV XWIKI_VERSION="14.10.5"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 2fcfb622319172c2e424b9c11848ebfabe27cf8ef69cba39ceb5d124b7ebe713
+ENV XWIKI_DOWNLOAD_SHA256 f58465d0869e4c5605ae8375a09c79399d1149c7131fed3cf9959918267eb6a8
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/14/mysql-tomcat/.env b/14/mysql-tomcat/.env
index 0e7475f..6365358 100644
--- a/14/mysql-tomcat/.env
+++ b/14/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=14.10.4
+XWIKI_VERSION=14.10.5
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile
index f796f24..94af803 100644
--- a/14/mysql-tomcat/Dockerfile
+++ b/14/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="14.10.4"
+ENV XWIKI_VERSION="14.10.5"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 2fcfb622319172c2e424b9c11848ebfabe27cf8ef69cba39ceb5d124b7ebe713
+ENV XWIKI_DOWNLOAD_SHA256 f58465d0869e4c5605ae8375a09c79399d1149c7131fed3cf9959918267eb6a8
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/14/postgres-tomcat/.env b/14/postgres-tomcat/.env
index 261a15d..e1819ae 100644
--- a/14/postgres-tomcat/.env
+++ b/14/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=14.10.4
+XWIKI_VERSION=14.10.5
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/14/postgres-tomcat/Dockerfile b/14/postgres-tomcat/Dockerfile
index 5cd7a91..8423986 100644
--- a/14/postgres-tomcat/Dockerfile
+++ b/14/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="14.10.4"
+ENV XWIKI_VERSION="14.10.5"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 2fcfb622319172c2e424b9c11848ebfabe27cf8ef69cba39ceb5d124b7ebe713
+ENV XWIKI_DOWNLOAD_SHA256 f58465d0869e4c5605ae8375a09c79399d1149c7131fed3cf9959918267eb6a8
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 eb23089..38f744d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,8 @@ defaultTasks 'generate'
def variants = ['mysql-tomcat', 'mariadb-tomcat', 'postgres-tomcat']
// Notes:
-// - To compute the XWiki sha256, download the XWiki WAR and issue:
+// - To compute the XWiki sha256, download the XWiki WAR from
+// http://nexus.xwiki.org/nexus/content/groups/public/org/xwiki/platform/xwiki-platform-distribution-war, and issue:
// - Unix: sha256sum <binary name>
// - Mac: shasum --algorithm 256 <binary name>
// - To compute the mysql JDBC sha256, get the JAR at https://search.maven.org/artifact/com.mysql/mysql-connector-j and
@@ -51,8 +52,8 @@ def tokens = [
mariadbJDBCSha256: 'aaec1ad348d030a65b25c93c65cdaf472bf8b4b6b314b965e5ba13aec81bc622'
],
'14': [
- xwikiVersion: '14.10.4',
- xwikiSha256: '2fcfb622319172c2e424b9c11848ebfabe27cf8ef69cba39ceb5d124b7ebe713',
+ xwikiVersion: '14.10.5',
+ xwikiSha256: 'f58465d0869e4c5605ae8375a09c79399d1149c7131fed3cf9959918267eb6a8',
mysqlJDBCVersion: '8.0.32',
mysqlJDBCSha256: '522329fe925980f02e5eb89b59d227245d345415ff0c08932a68c9765c13acc5',
mariadbJDBCVersion: '3.1.2',
--
GitLab