From cb87e8e016aaa420d362adaf08813028ce95fd96 Mon Sep 17 00:00:00 2001 From: Thomas Mortagne <thomas.mortagne@gmail.com> Date: Mon, 12 Dec 2022 13:33:57 +0100 Subject: [PATCH] XDOCKER-257: Upgrade stable version to 14.10.1 --- 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 e4ff71a..18b558c 100644 --- a/14/mariadb-tomcat/.env +++ b/14/mariadb-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=14.10 +XWIKI_VERSION=14.10.1 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile index 0268d7a..db1bb33 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" +ENV XWIKI_VERSION="14.10.1" ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 5e412e550c31255de1500631d9dcf46f7d746e6758717f63a90fa5c807429937 +ENV XWIKI_DOWNLOAD_SHA256 88d84d3fdf6acabea7e0ab5ad10d3191da8320b5820b1ca83adf05db5c6b457a 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 e4ff71a..18b558c 100644 --- a/14/mysql-tomcat/.env +++ b/14/mysql-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=14.10 +XWIKI_VERSION=14.10.1 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile index d1c7260..e67ffa1 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" +ENV XWIKI_VERSION="14.10.1" ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 5e412e550c31255de1500631d9dcf46f7d746e6758717f63a90fa5c807429937 +ENV XWIKI_DOWNLOAD_SHA256 88d84d3fdf6acabea7e0ab5ad10d3191da8320b5820b1ca83adf05db5c6b457a 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 10ee509..d27f94c 100644 --- a/14/postgres-tomcat/.env +++ b/14/postgres-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=14.10 +XWIKI_VERSION=14.10.1 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/14/postgres-tomcat/Dockerfile b/14/postgres-tomcat/Dockerfile index 1fd64ea..f42c053 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" +ENV XWIKI_VERSION="14.10.1" ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 5e412e550c31255de1500631d9dcf46f7d746e6758717f63a90fa5c807429937 +ENV XWIKI_DOWNLOAD_SHA256 88d84d3fdf6acabea7e0ab5ad10d3191da8320b5820b1ca83adf05db5c6b457a 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 3bdbd63..8a45966 100644 --- a/build.gradle +++ b/build.gradle @@ -43,8 +43,8 @@ def variants = ['mysql-tomcat', 'mariadb-tomcat', 'postgres-tomcat'] def tokens = [ '14': [ - xwikiVersion: '14.10', - xwikiSha256: '5e412e550c31255de1500631d9dcf46f7d746e6758717f63a90fa5c807429937', + xwikiVersion: '14.10.1', + xwikiSha256: '88d84d3fdf6acabea7e0ab5ad10d3191da8320b5820b1ca83adf05db5c6b457a', mysqlJDBCVersion: '8.0.31', mysqlJDBCSha256: '5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f', mariadbJDBCVersion: '3.0.9', -- GitLab