From 9494f0e950aee6750b349ed758a372e4b9407c40 Mon Sep 17 00:00:00 2001 From: Michael Hamann <michael.hamann@xwiki.com> Date: Tue, 29 Nov 2022 12:27:54 +0100 Subject: [PATCH] XDOCKER-256: Upgrade stable version to 14.10 --- 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 8fdc6f6..e4ff71a 100644 --- a/14/mariadb-tomcat/.env +++ b/14/mariadb-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=14.9 +XWIKI_VERSION=14.10 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile index 7f0d3f8..0268d7a 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.9" +ENV XWIKI_VERSION="14.10" ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 9a8639b590b2612c1603ac6788fe83b4d79dbaad484cc5c60230c00f16781460 +ENV XWIKI_DOWNLOAD_SHA256 5e412e550c31255de1500631d9dcf46f7d746e6758717f63a90fa5c807429937 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 8fdc6f6..e4ff71a 100644 --- a/14/mysql-tomcat/.env +++ b/14/mysql-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=14.9 +XWIKI_VERSION=14.10 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile index 7212507..d1c7260 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.9" +ENV XWIKI_VERSION="14.10" ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 9a8639b590b2612c1603ac6788fe83b4d79dbaad484cc5c60230c00f16781460 +ENV XWIKI_DOWNLOAD_SHA256 5e412e550c31255de1500631d9dcf46f7d746e6758717f63a90fa5c807429937 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 99f44ef..10ee509 100644 --- a/14/postgres-tomcat/.env +++ b/14/postgres-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=14.9 +XWIKI_VERSION=14.10 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/14/postgres-tomcat/Dockerfile b/14/postgres-tomcat/Dockerfile index 39b0af5..1fd64ea 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.9" +ENV XWIKI_VERSION="14.10" ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 9a8639b590b2612c1603ac6788fe83b4d79dbaad484cc5c60230c00f16781460 +ENV XWIKI_DOWNLOAD_SHA256 5e412e550c31255de1500631d9dcf46f7d746e6758717f63a90fa5c807429937 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 dbd1a81..3bdbd63 100644 --- a/build.gradle +++ b/build.gradle @@ -43,8 +43,8 @@ def variants = ['mysql-tomcat', 'mariadb-tomcat', 'postgres-tomcat'] def tokens = [ '14': [ - xwikiVersion: '14.9', - xwikiSha256: '9a8639b590b2612c1603ac6788fe83b4d79dbaad484cc5c60230c00f16781460', + xwikiVersion: '14.10', + xwikiSha256: '5e412e550c31255de1500631d9dcf46f7d746e6758717f63a90fa5c807429937', mysqlJDBCVersion: '8.0.31', mysqlJDBCSha256: '5249e3dc6d6531b37790e3f61845b96db5e41e891d3d8edb0e2e3a1b53ca2f4f', mariadbJDBCVersion: '3.0.9', -- GitLab