Update XWiki's mid-year LTS version to 16.4.7 #18607
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 8a1b942:diff --git a/_bashbrew-cat b/_bashbrew-cat
index b47899a..09e320b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -31,19 +31,19 @@ Architectures: amd64, arm64v8
GitCommit: a668c18d7c49f33ebf188da04e7e2a1473960550
Directory: 16/postgres-tomcat
-Tags: 16.4, 16.4.6, 16.4-mysql-tomcat, 16.4.6-mysql-tomcat
+Tags: 16.4, 16.4.7, 16.4-mysql-tomcat, 16.4.7-mysql-tomcat
Architectures: amd64, arm64v8
-GitCommit: 5057e7a60d9f378812ed95095c7f7217a465af01
+GitCommit: 58e6e3f59cc6c7f15a7a1d0fe5b2390353e61e6d
Directory: 16.4/mysql-tomcat
-Tags: 16.4-mariadb-tomcat, 16.4.6-mariadb-tomcat
+Tags: 16.4-mariadb-tomcat, 16.4.7-mariadb-tomcat
Architectures: amd64, arm64v8
-GitCommit: 5057e7a60d9f378812ed95095c7f7217a465af01
+GitCommit: 58e6e3f59cc6c7f15a7a1d0fe5b2390353e61e6d
Directory: 16.4/mariadb-tomcat
-Tags: 16.4-postgres-tomcat, 16.4.6-postgres-tomcat
+Tags: 16.4-postgres-tomcat, 16.4.7-postgres-tomcat
Architectures: amd64, arm64v8
-GitCommit: 5057e7a60d9f378812ed95095c7f7217a465af01
+GitCommit: 58e6e3f59cc6c7f15a7a1d0fe5b2390353e61e6d
Directory: 16.4/postgres-tomcat
Tags: 17, 17.1, 17.1.0, 17-mysql-tomcat, 17.1-mysql-tomcat, 17.1.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
diff --git a/_bashbrew-list b/_bashbrew-list
index a39a991..46e77c8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -18,10 +18,10 @@ xwiki:16.4
xwiki:16.4-mariadb-tomcat
xwiki:16.4-mysql-tomcat
xwiki:16.4-postgres-tomcat
-xwiki:16.4.6
-xwiki:16.4.6-mariadb-tomcat
-xwiki:16.4.6-mysql-tomcat
-xwiki:16.4.6-postgres-tomcat
+xwiki:16.4.7
+xwiki:16.4.7-mariadb-tomcat
+xwiki:16.4.7-mysql-tomcat
+xwiki:16.4.7-postgres-tomcat
xwiki:16.10
xwiki:16.10-mariadb-tomcat
xwiki:16.10-mysql-tomcat
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 3e9e8a6..d378459 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,9 +1,9 @@
xwiki:14.10.21-mariadb-tomcat
xwiki:14.10.21-mysql-tomcat
xwiki:14.10.21-postgres-tomcat
-xwiki:16.4.6-mariadb-tomcat
-xwiki:16.4.6-mysql-tomcat
-xwiki:16.4.6-postgres-tomcat
+xwiki:16.4.7-mariadb-tomcat
+xwiki:16.4.7-mysql-tomcat
+xwiki:16.4.7-postgres-tomcat
xwiki:latest
xwiki:lts
xwiki:lts-mariadb
diff --git a/xwiki_16.4.6-mariadb-tomcat/Dockerfile b/xwiki_16.4.7-mariadb-tomcat/Dockerfile
similarity index 96%
rename from xwiki_16.4.6-mariadb-tomcat/Dockerfile
rename to xwiki_16.4.7-mariadb-tomcat/Dockerfile
index 75d8e0c..08bf18f 100644
--- a/xwiki_16.4.6-mariadb-tomcat/Dockerfile
+++ b/xwiki_16.4.7-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="16.4.6"
+ENV XWIKI_VERSION="16.4.7"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 b41e9d29eafd31acdcf44c7ca5c81eacb2067ca129cf35391d10f493f6e623d3
+ENV XWIKI_DOWNLOAD_SHA256 faa33bbf5e127e40e151a831624073464aafe39816b433bd73376f64d9f86c25
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
# We take the database driver version from the Maven Central repository since we want to control the version
# used and have it being consistent with what is tested in the CI.
-ENV MARIADB_JDBC_VERSION="3.5.1"
-ENV MARIADB_JDBC_SHA256="50a50c4a3c13c30dfbd40587f7ad9a496197d285ede0948641d9eee68fdf2106"
+ENV MARIADB_JDBC_VERSION="3.5.2"
+ENV MARIADB_JDBC_SHA256="f2f3c3c1a3bdaca69dd1d4e1cd8aed075242fc72ae41463ddb82e367b388f6ad"
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_16.4.6-mariadb-tomcat/tomcat/setenv.sh b/xwiki_16.4.7-mariadb-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_16.4.6-mariadb-tomcat/tomcat/setenv.sh
rename to xwiki_16.4.7-mariadb-tomcat/tomcat/setenv.sh
diff --git a/xwiki_16.4.6-mariadb-tomcat/xwiki/docker-entrypoint.sh b/xwiki_16.4.7-mariadb-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_16.4.6-mariadb-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_16.4.7-mariadb-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_16.4.6-mariadb-tomcat/xwiki/hibernate.cfg.xml b/xwiki_16.4.7-mariadb-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_16.4.6-mariadb-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_16.4.7-mariadb-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_16.4.6-mysql-tomcat/Dockerfile b/xwiki_16.4.7-mysql-tomcat/Dockerfile
similarity index 98%
rename from xwiki_16.4.6-mysql-tomcat/Dockerfile
rename to xwiki_16.4.7-mysql-tomcat/Dockerfile
index c4ad0c4..7e52b9b 100644
--- a/xwiki_16.4.6-mysql-tomcat/Dockerfile
+++ b/xwiki_16.4.7-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="16.4.6"
+ENV XWIKI_VERSION="16.4.7"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 b41e9d29eafd31acdcf44c7ca5c81eacb2067ca129cf35391d10f493f6e623d3
+ENV XWIKI_DOWNLOAD_SHA256 faa33bbf5e127e40e151a831624073464aafe39816b433bd73376f64d9f86c25
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_16.4.6-mysql-tomcat/tomcat/setenv.sh b/xwiki_16.4.7-mysql-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_16.4.6-mysql-tomcat/tomcat/setenv.sh
rename to xwiki_16.4.7-mysql-tomcat/tomcat/setenv.sh
diff --git a/xwiki_16.4.6-mysql-tomcat/xwiki/docker-entrypoint.sh b/xwiki_16.4.7-mysql-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_16.4.6-mysql-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_16.4.7-mysql-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_16.4.6-mysql-tomcat/xwiki/hibernate.cfg.xml b/xwiki_16.4.7-mysql-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_16.4.6-mysql-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_16.4.7-mysql-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_16.4.6-postgres-tomcat/Dockerfile b/xwiki_16.4.7-postgres-tomcat/Dockerfile
similarity index 98%
rename from xwiki_16.4.6-postgres-tomcat/Dockerfile
rename to xwiki_16.4.7-postgres-tomcat/Dockerfile
index 89fc37b..d9bff9b 100644
--- a/xwiki_16.4.6-postgres-tomcat/Dockerfile
+++ b/xwiki_16.4.7-postgres-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="16.4.6"
+ENV XWIKI_VERSION="16.4.7"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 b41e9d29eafd31acdcf44c7ca5c81eacb2067ca129cf35391d10f493f6e623d3
+ENV XWIKI_DOWNLOAD_SHA256 faa33bbf5e127e40e151a831624073464aafe39816b433bd73376f64d9f86c25
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_16.4.6-postgres-tomcat/tomcat/setenv.sh b/xwiki_16.4.7-postgres-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_16.4.6-postgres-tomcat/tomcat/setenv.sh
rename to xwiki_16.4.7-postgres-tomcat/tomcat/setenv.sh
diff --git a/xwiki_16.4.6-postgres-tomcat/xwiki/docker-entrypoint.sh b/xwiki_16.4.7-postgres-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_16.4.6-postgres-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_16.4.7-postgres-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_16.4.6-postgres-tomcat/xwiki/hibernate.cfg.xml b/xwiki_16.4.7-postgres-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_16.4.6-postgres-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_16.4.7-postgres-tomcat/xwiki/hibernate.cfg.xmlRelevant Maintainers:
|
tianon
approved these changes
Mar 11, 2025
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.