diff --git a/11/mysql-tomcat/.env b/11/mysql-tomcat/.env index bbdc5bca8e28fc9766869e7c5839ec674ecb598a..be8ba43788821ba797147295d693d3cb36e3736f 100644 --- a/11/mysql-tomcat/.env +++ b/11/mysql-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=11.10.10 +XWIKI_VERSION=11.10.11 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/11/mysql-tomcat/Dockerfile b/11/mysql-tomcat/Dockerfile index d5d5b3d1dcee72e26a03ae28d060db0c48970114..7e095450dded04d20807b84b12c93cc63ad4a7f6 100644 --- a/11/mysql-tomcat/Dockerfile +++ b/11/mysql-tomcat/Dockerfile @@ -43,9 +43,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="11.10.10" +ENV XWIKI_VERSION="11.10.11" ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 497477c610b668bed7314c89bb0bde6dae4a0664404f4d4499e1d95d7eb94829 +ENV XWIKI_DOWNLOAD_SHA256 21845fe8eed97708b86c0a7050cd99710633d0d3ed5b1084358694e101bd353e RUN rm -rf /usr/local/tomcat/webapps/* && \ mkdir -p /usr/local/tomcat/temp && \ mkdir -p /usr/local/xwiki/data && \ @@ -57,8 +57,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \ # Copy the JDBC driver in the XWiki webapp # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to # date Debian repository for it anymore. -ENV MYSQL_JDBC_VERSION="8.0.21" -ENV MYSQL_JDBC_SHA256="2f62d886270a75ebc8e8fd89127d4a30ccc711f02256ade2cfb7090817132003" +ENV MYSQL_JDBC_VERSION="8.0.22" +ENV MYSQL_JDBC_SHA256="5019defbd12316295e97a6e88f2a9b07f118345a4e982710bba232e499b22f4f" ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}" ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar" ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}" diff --git a/11/postgres-tomcat/.env b/11/postgres-tomcat/.env index d789f49cf1c257dae66ff0c275cf0c0b6ae098bb..8512214c68ca865fbdcf2051160d99da02e3eaaa 100644 --- a/11/postgres-tomcat/.env +++ b/11/postgres-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=11.10.10 +XWIKI_VERSION=11.10.11 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/11/postgres-tomcat/Dockerfile b/11/postgres-tomcat/Dockerfile index 18094ec7f8608f820be0c2cedde78f974ec7b2fc..7fe84508f1b426b6fa96deeb7e9c4fe0573ad2c0 100644 --- a/11/postgres-tomcat/Dockerfile +++ b/11/postgres-tomcat/Dockerfile @@ -44,9 +44,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="11.10.10" +ENV XWIKI_VERSION="11.10.11" ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 497477c610b668bed7314c89bb0bde6dae4a0664404f4d4499e1d95d7eb94829 +ENV XWIKI_DOWNLOAD_SHA256 21845fe8eed97708b86c0a7050cd99710633d0d3ed5b1084358694e101bd353e RUN rm -rf /usr/local/tomcat/webapps/* && \ mkdir -p /usr/local/tomcat/temp && \ mkdir -p /usr/local/xwiki/data && \ diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile index 87048d8bd3cf2e448eab0d0b2acd32c0ab0cbf22..6813ede6de2d1ed6d9cddd39cb1ea503ffa43bdb 100644 --- a/12/mysql-tomcat/Dockerfile +++ b/12/mysql-tomcat/Dockerfile @@ -57,8 +57,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \ # Copy the JDBC driver in the XWiki webapp # For MYSQL, download the MySQL driver version from the Maven Central repository since there's no up to # date Debian repository for it anymore. -ENV MYSQL_JDBC_VERSION="8.0.21" -ENV MYSQL_JDBC_SHA256="2f62d886270a75ebc8e8fd89127d4a30ccc711f02256ade2cfb7090817132003" +ENV MYSQL_JDBC_VERSION="8.0.22" +ENV MYSQL_JDBC_SHA256="5019defbd12316295e97a6e88f2a9b07f118345a4e982710bba232e499b22f4f" ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_JDBC_VERSION}" ENV MYSQL_JDBC_ARTIFACT="mysql-connector-java-${MYSQL_JDBC_VERSION}.jar" ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}" diff --git a/build.gradle b/build.gradle index 58f4593db3e64803d701474f8a97c89bcff0b7a6..d93a2d6821bf21debfde086af235bf37b9c17854 100644 --- a/build.gradle +++ b/build.gradle @@ -35,8 +35,8 @@ def variants = ['mysql-tomcat', 'postgres-tomcat'] def tokens = [ '11': [ - xwikiVersion: '11.10.10', - xwikiSha256: '497477c610b668bed7314c89bb0bde6dae4a0664404f4d4499e1d95d7eb94829' + xwikiVersion: '11.10.11', + xwikiSha256: '21845fe8eed97708b86c0a7050cd99710633d0d3ed5b1084358694e101bd353e' ], '12': [ xwikiVersion: '12.9',