Update XWiki Mid-year "LTS" version to 15.5.2 #15289
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for 1b2e887:diff --git a/_bashbrew-cat b/_bashbrew-cat
index b0f042c..244f5ef 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -31,17 +31,17 @@ Architectures: amd64, arm64v8
GitCommit: d59d719dd80977ba9ae0e95e7806e93b65aed479
Directory: 15/postgres-tomcat
-Tags: 15.5, 15.5.1, 15.5-mysql-tomcat, 15.5.1-mysql-tomcat
+Tags: 15.5, 15.5.2, 15.5-mysql-tomcat, 15.5.2-mysql-tomcat
Architectures: amd64, arm64v8
-GitCommit: 280bb2f94c270db7b9cab529ef639fc46e90e868
+GitCommit: 87cd49b5f9ff731aa41723d1badb705e06f4aa41
Directory: 15.5/mysql-tomcat
-Tags: 15.5-mariadb-tomcat, 15.5.1-mariadb-tomcat
+Tags: 15.5-mariadb-tomcat, 15.5.2-mariadb-tomcat
Architectures: amd64, arm64v8
-GitCommit: 280bb2f94c270db7b9cab529ef639fc46e90e868
+GitCommit: 87cd49b5f9ff731aa41723d1badb705e06f4aa41
Directory: 15.5/mariadb-tomcat
-Tags: 15.5-postgres-tomcat, 15.5.1-postgres-tomcat
+Tags: 15.5-postgres-tomcat, 15.5.2-postgres-tomcat
Architectures: amd64, arm64v8
-GitCommit: 280bb2f94c270db7b9cab529ef639fc46e90e868
+GitCommit: 87cd49b5f9ff731aa41723d1badb705e06f4aa41
Directory: 15.5/postgres-tomcat
diff --git a/_bashbrew-list b/_bashbrew-list
index 3cc4ed9..a687b1f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -18,10 +18,10 @@ xwiki:15.5
xwiki:15.5-mariadb-tomcat
xwiki:15.5-mysql-tomcat
xwiki:15.5-postgres-tomcat
-xwiki:15.5.1
-xwiki:15.5.1-mariadb-tomcat
-xwiki:15.5.1-mysql-tomcat
-xwiki:15.5.1-postgres-tomcat
+xwiki:15.5.2
+xwiki:15.5.2-mariadb-tomcat
+xwiki:15.5.2-mysql-tomcat
+xwiki:15.5.2-postgres-tomcat
xwiki:15.7
xwiki:15.7-mariadb-tomcat
xwiki:15.7-mysql-tomcat
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 7160898..7752351 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -4,6 +4,6 @@ xwiki:lts-postgres
xwiki:latest
xwiki:stable-mariadb
xwiki:stable-postgres
-xwiki:15.5.1-mysql-tomcat
-xwiki:15.5.1-mariadb-tomcat
-xwiki:15.5.1-postgres-tomcat
+xwiki:15.5.2-mysql-tomcat
+xwiki:15.5.2-mariadb-tomcat
+xwiki:15.5.2-postgres-tomcat
diff --git a/xwiki_15.5.1-mariadb-tomcat/Dockerfile b/xwiki_15.5.2-mariadb-tomcat/Dockerfile
similarity index 96%
rename from xwiki_15.5.1-mariadb-tomcat/Dockerfile
rename to xwiki_15.5.2-mariadb-tomcat/Dockerfile
index aa8f8e2..8f0769a 100644
--- a/xwiki_15.5.1-mariadb-tomcat/Dockerfile
+++ b/xwiki_15.5.2-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="15.5.1"
+ENV XWIKI_VERSION="15.5.2"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 9f17f1739a04d1f73415e20ac44e38f87a517b64605b769c5f3bf4af2181c319
+ENV XWIKI_DOWNLOAD_SHA256 8e41d7f49df2fde1f6e5fc86304fb7c2ccd2af57332fc833b24fb4a1cb031629
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
# Copy the JDBC driver in the XWiki webapp
# For MariaDB, download the MariaDB driver version from the Maven Central repository to control the version
# used.
-ENV MARIADB_JDBC_VERSION="3.1.4"
-ENV MARIADB_JDBC_SHA256="eb88b5d727d82e25117e2b6fabcec1daf734633b0a576456c73215884c189ad4"
+ENV MARIADB_JDBC_VERSION="3.2.0"
+ENV MARIADB_JDBC_SHA256="adf9df10bc9b2a137def36d6a495812258f430d4a8f7946727c61558e6c73941"
ENV MARIADB_JDBC_PREFIX="https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/${MARIADB_JDBC_VERSION}"
ENV MARIADB_JDBC_ARTIFACT="mariadb-java-client-${MARIADB_JDBC_VERSION}.jar"
ENV MARIADB_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MARIADB_JDBC_ARTIFACT}"
diff --git a/xwiki_15.5.1-mariadb-tomcat/tomcat/setenv.sh b/xwiki_15.5.2-mariadb-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_15.5.1-mariadb-tomcat/tomcat/setenv.sh
rename to xwiki_15.5.2-mariadb-tomcat/tomcat/setenv.sh
diff --git a/xwiki_15.5.1-mariadb-tomcat/xwiki/docker-entrypoint.sh b/xwiki_15.5.2-mariadb-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_15.5.1-mariadb-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_15.5.2-mariadb-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_15.5.1-mariadb-tomcat/xwiki/hibernate.cfg.xml b/xwiki_15.5.2-mariadb-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_15.5.1-mariadb-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_15.5.2-mariadb-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_15.5.1-mysql-tomcat/Dockerfile b/xwiki_15.5.2-mysql-tomcat/Dockerfile
similarity index 96%
rename from xwiki_15.5.1-mysql-tomcat/Dockerfile
rename to xwiki_15.5.2-mysql-tomcat/Dockerfile
index 013dc29..e193062 100644
--- a/xwiki_15.5.1-mysql-tomcat/Dockerfile
+++ b/xwiki_15.5.2-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="15.5.1"
+ENV XWIKI_VERSION="15.5.2"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 9f17f1739a04d1f73415e20ac44e38f87a517b64605b769c5f3bf4af2181c319
+ENV XWIKI_DOWNLOAD_SHA256 8e41d7f49df2fde1f6e5fc86304fb7c2ccd2af57332fc833b24fb4a1cb031629
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
@@ -62,8 +62,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.33"
-ENV MYSQL_JDBC_SHA256="e2a3b2fc726a1ac64e998585db86b30fa8bf3f706195b78bb77c5f99bf877bd9"
+ENV MYSQL_JDBC_VERSION="8.1.0"
+ENV MYSQL_JDBC_SHA256="e2e657e9c5ebe06a73485c9739ebd8a18e7bebb852a58d0da287da850beca1c7"
ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/${MYSQL_JDBC_VERSION}"
ENV MYSQL_JDBC_ARTIFACT="mysql-connector-j-${MYSQL_JDBC_VERSION}.jar"
ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"
diff --git a/xwiki_15.5.1-mysql-tomcat/tomcat/setenv.sh b/xwiki_15.5.2-mysql-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_15.5.1-mysql-tomcat/tomcat/setenv.sh
rename to xwiki_15.5.2-mysql-tomcat/tomcat/setenv.sh
diff --git a/xwiki_15.5.1-mysql-tomcat/xwiki/docker-entrypoint.sh b/xwiki_15.5.2-mysql-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_15.5.1-mysql-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_15.5.2-mysql-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_15.5.1-mysql-tomcat/xwiki/hibernate.cfg.xml b/xwiki_15.5.2-mysql-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_15.5.1-mysql-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_15.5.2-mysql-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_15.5.1-postgres-tomcat/Dockerfile b/xwiki_15.5.2-postgres-tomcat/Dockerfile
similarity index 97%
rename from xwiki_15.5.1-postgres-tomcat/Dockerfile
rename to xwiki_15.5.2-postgres-tomcat/Dockerfile
index a703c23..5fa808e 100644
--- a/xwiki_15.5.1-postgres-tomcat/Dockerfile
+++ b/xwiki_15.5.2-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="15.5.1"
+ENV XWIKI_VERSION="15.5.2"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 9f17f1739a04d1f73415e20ac44e38f87a517b64605b769c5f3bf4af2181c319
+ENV XWIKI_DOWNLOAD_SHA256 8e41d7f49df2fde1f6e5fc86304fb7c2ccd2af57332fc833b24fb4a1cb031629
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_15.5.1-postgres-tomcat/tomcat/setenv.sh b/xwiki_15.5.2-postgres-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_15.5.1-postgres-tomcat/tomcat/setenv.sh
rename to xwiki_15.5.2-postgres-tomcat/tomcat/setenv.sh
diff --git a/xwiki_15.5.1-postgres-tomcat/xwiki/docker-entrypoint.sh b/xwiki_15.5.2-postgres-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_15.5.1-postgres-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_15.5.2-postgres-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_15.5.1-postgres-tomcat/xwiki/hibernate.cfg.xml b/xwiki_15.5.2-postgres-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_15.5.1-postgres-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_15.5.2-postgres-tomcat/xwiki/hibernate.cfg.xmlRelevant Maintainers:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.