From 708b26a42ee4bb46d5445315e19be1a019151e71 Mon Sep 17 00:00:00 2001 From: Simon Urli <simon.urli@xwiki.com> Date: Wed, 1 Feb 2023 18:31:41 +0100 Subject: [PATCH] XDOCKER-265: Upgrade LTS version to 14.10.4 --- 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 | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/14/mariadb-tomcat/.env b/14/mariadb-tomcat/.env index 3cf2c05..0e7475f 100644 --- a/14/mariadb-tomcat/.env +++ b/14/mariadb-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=14.10.3 +XWIKI_VERSION=14.10.4 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile index 006aafa..d51372f 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.3" +ENV XWIKI_VERSION="14.10.4" ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 62e21e356268ac50e16b54614e0c4a4c1ee0fc81f2e34b393464efdbcf1f5b1f +ENV XWIKI_DOWNLOAD_SHA256 2fcfb622319172c2e424b9c11848ebfabe27cf8ef69cba39ceb5d124b7ebe713 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 3cf2c05..0e7475f 100644 --- a/14/mysql-tomcat/.env +++ b/14/mysql-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=14.10.3 +XWIKI_VERSION=14.10.4 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile index cd36cc1..495d6eb 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.3" +ENV XWIKI_VERSION="14.10.4" ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 62e21e356268ac50e16b54614e0c4a4c1ee0fc81f2e34b393464efdbcf1f5b1f +ENV XWIKI_DOWNLOAD_SHA256 2fcfb622319172c2e424b9c11848ebfabe27cf8ef69cba39ceb5d124b7ebe713 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 b8e5ba6..261a15d 100644 --- a/14/postgres-tomcat/.env +++ b/14/postgres-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=14.10.3 +XWIKI_VERSION=14.10.4 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/14/postgres-tomcat/Dockerfile b/14/postgres-tomcat/Dockerfile index 7846329..5cd7a91 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.3" +ENV XWIKI_VERSION="14.10.4" ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 62e21e356268ac50e16b54614e0c4a4c1ee0fc81f2e34b393464efdbcf1f5b1f +ENV XWIKI_DOWNLOAD_SHA256 2fcfb622319172c2e424b9c11848ebfabe27cf8ef69cba39ceb5d124b7ebe713 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 539e6ab..e22d273 100644 --- a/build.gradle +++ b/build.gradle @@ -51,8 +51,8 @@ def tokens = [ mariadbJDBCSha256: 'a554541fd88047905fb0c4c10e1d85295f5e38c7bb5fb408b425392a79fc26e3' ], '14': [ - xwikiVersion: '14.10.3', - xwikiSha256: '62e21e356268ac50e16b54614e0c4a4c1ee0fc81f2e34b393464efdbcf1f5b1f', + xwikiVersion: '14.10.4', + xwikiSha256: '2fcfb622319172c2e424b9c11848ebfabe27cf8ef69cba39ceb5d124b7ebe713', mysqlJDBCVersion: '8.0.31', mysqlJDBCSha256: '5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f', mariadbJDBCVersion: '3.1.1', -- GitLab