Update 16.10.x to 16.10.16 for xwiki library #20591
Merged
Conversation
This file contains hidden or 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 d377484:diff --git a/_bashbrew-cat b/_bashbrew-cat
index c432214..5a26dfb 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,19 +1,19 @@
Maintainers: XWiki Core Dev Team <[email protected]> (@xwiki)
GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git
-Tags: 16, 16.10, 16.10.15, 16-mysql-tomcat, 16.10-mysql-tomcat, 16.10.15-mysql-tomcat
+Tags: 16, 16.10, 16.10.16, 16-mysql-tomcat, 16.10-mysql-tomcat, 16.10.16-mysql-tomcat
Architectures: amd64, arm64v8
-GitCommit: e0b607a585020256b8517302ac7ad2cb1e6e0e1e
+GitCommit: 94c6de808dce8af709a7f422837cc0b44e428bc8
Directory: 16/mysql-tomcat
-Tags: 16-mariadb-tomcat, 16.10-mariadb-tomcat, 16.10.15-mariadb-tomcat
+Tags: 16-mariadb-tomcat, 16.10-mariadb-tomcat, 16.10.16-mariadb-tomcat
Architectures: amd64, arm64v8
-GitCommit: e0b607a585020256b8517302ac7ad2cb1e6e0e1e
+GitCommit: 94c6de808dce8af709a7f422837cc0b44e428bc8
Directory: 16/mariadb-tomcat
-Tags: 16-postgres-tomcat, 16.10-postgres-tomcat, 16.10.15-postgres-tomcat
+Tags: 16-postgres-tomcat, 16.10-postgres-tomcat, 16.10.16-postgres-tomcat
Architectures: amd64, arm64v8
-GitCommit: e0b607a585020256b8517302ac7ad2cb1e6e0e1e
+GitCommit: 94c6de808dce8af709a7f422837cc0b44e428bc8
Directory: 16/postgres-tomcat
Tags: 17, 17.10, 17.10.2, 17-mysql-tomcat, 17.10-mysql-tomcat, 17.10.2-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest, lts-mysql-tomcat, lts-mysql, lts
diff --git a/_bashbrew-list b/_bashbrew-list
index cf88b03..d742759 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ xwiki:16.10
xwiki:16.10-mariadb-tomcat
xwiki:16.10-mysql-tomcat
xwiki:16.10-postgres-tomcat
-xwiki:16.10.15
-xwiki:16.10.15-mariadb-tomcat
-xwiki:16.10.15-mysql-tomcat
-xwiki:16.10.15-postgres-tomcat
+xwiki:16.10.16
+xwiki:16.10.16-mariadb-tomcat
+xwiki:16.10.16-mysql-tomcat
+xwiki:16.10.16-postgres-tomcat
xwiki:17
xwiki:17-mariadb-tomcat
xwiki:17-mysql-tomcat
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 10eccb7..fec971c 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,6 +1,6 @@
-xwiki:16.10.15-mariadb-tomcat
-xwiki:16.10.15-mysql-tomcat
-xwiki:16.10.15-postgres-tomcat
+xwiki:16.10.16-mariadb-tomcat
+xwiki:16.10.16-mysql-tomcat
+xwiki:16.10.16-postgres-tomcat
xwiki:17.4.7-mariadb-tomcat
xwiki:17.4.7-mysql-tomcat
xwiki:17.4.7-postgres-tomcat
diff --git a/xwiki_16.10.15-mariadb-tomcat/Dockerfile b/xwiki_16.10.16-mariadb-tomcat/Dockerfile
similarity index 96%
rename from xwiki_16.10.15-mariadb-tomcat/Dockerfile
rename to xwiki_16.10.16-mariadb-tomcat/Dockerfile
index 6f627eb..db5c099 100644
--- a/xwiki_16.10.15-mariadb-tomcat/Dockerfile
+++ b/xwiki_16.10.16-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.10.15"
+ENV XWIKI_VERSION="16.10.16"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 996a47663bdc3d5abe93f76bda73ceb670618d3602e67c7077cb5962db436819
+ENV XWIKI_DOWNLOAD_SHA256 e5df973b0fda8701e15bde16d5c2786a9cb2c5a1dde719bc4abe5e78c757a3f0
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.6"
-ENV MARIADB_JDBC_SHA256="a129703efd7b0f334564d46753de999f09b3a361489a2eb647e6020390981cc9"
+ENV MARIADB_JDBC_VERSION="3.5.7"
+ENV MARIADB_JDBC_SHA256="07bb1229dc184f3313a5aef4c5a6b3207c8dbaa09db4a26814c936f004b4c526"
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.10.15-mariadb-tomcat/tomcat/setenv.sh b/xwiki_16.10.16-mariadb-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_16.10.15-mariadb-tomcat/tomcat/setenv.sh
rename to xwiki_16.10.16-mariadb-tomcat/tomcat/setenv.sh
diff --git a/xwiki_16.10.15-mariadb-tomcat/xwiki/docker-entrypoint.sh b/xwiki_16.10.16-mariadb-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_16.10.15-mariadb-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_16.10.16-mariadb-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_16.10.15-mariadb-tomcat/xwiki/hibernate.cfg.xml b/xwiki_16.10.16-mariadb-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_16.10.15-mariadb-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_16.10.16-mariadb-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_16.10.15-mysql-tomcat/Dockerfile b/xwiki_16.10.16-mysql-tomcat/Dockerfile
similarity index 98%
rename from xwiki_16.10.15-mysql-tomcat/Dockerfile
rename to xwiki_16.10.16-mysql-tomcat/Dockerfile
index 32e1f6a..8c946e7 100644
--- a/xwiki_16.10.15-mysql-tomcat/Dockerfile
+++ b/xwiki_16.10.16-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.10.15"
+ENV XWIKI_VERSION="16.10.16"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 996a47663bdc3d5abe93f76bda73ceb670618d3602e67c7077cb5962db436819
+ENV XWIKI_DOWNLOAD_SHA256 e5df973b0fda8701e15bde16d5c2786a9cb2c5a1dde719bc4abe5e78c757a3f0
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_16.10.15-mysql-tomcat/tomcat/setenv.sh b/xwiki_16.10.16-mysql-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_16.10.15-mysql-tomcat/tomcat/setenv.sh
rename to xwiki_16.10.16-mysql-tomcat/tomcat/setenv.sh
diff --git a/xwiki_16.10.15-mysql-tomcat/xwiki/docker-entrypoint.sh b/xwiki_16.10.16-mysql-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_16.10.15-mysql-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_16.10.16-mysql-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_16.10.15-mysql-tomcat/xwiki/hibernate.cfg.xml b/xwiki_16.10.16-mysql-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_16.10.15-mysql-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_16.10.16-mysql-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_16.10.15-postgres-tomcat/Dockerfile b/xwiki_16.10.16-postgres-tomcat/Dockerfile
similarity index 98%
rename from xwiki_16.10.15-postgres-tomcat/Dockerfile
rename to xwiki_16.10.16-postgres-tomcat/Dockerfile
index 96cc13f..8592073 100644
--- a/xwiki_16.10.15-postgres-tomcat/Dockerfile
+++ b/xwiki_16.10.16-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.10.15"
+ENV XWIKI_VERSION="16.10.16"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 996a47663bdc3d5abe93f76bda73ceb670618d3602e67c7077cb5962db436819
+ENV XWIKI_DOWNLOAD_SHA256 e5df973b0fda8701e15bde16d5c2786a9cb2c5a1dde719bc4abe5e78c757a3f0
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_16.10.15-postgres-tomcat/tomcat/setenv.sh b/xwiki_16.10.16-postgres-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_16.10.15-postgres-tomcat/tomcat/setenv.sh
rename to xwiki_16.10.16-postgres-tomcat/tomcat/setenv.sh
diff --git a/xwiki_16.10.15-postgres-tomcat/xwiki/docker-entrypoint.sh b/xwiki_16.10.16-postgres-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_16.10.15-postgres-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_16.10.16-postgres-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_16.10.15-postgres-tomcat/xwiki/hibernate.cfg.xml b/xwiki_16.10.16-postgres-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_16.10.15-postgres-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_16.10.16-postgres-tomcat/xwiki/hibernate.cfg.xmlRelevant Maintainers:
|
yosifkit
approved these changes
Jan 7, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.