XWiki 16.4.1 has been released #17125
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 cb58acf:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 46d310d..e3eeb07 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -46,17 +46,17 @@ Architectures: amd64, arm64v8
GitCommit: 4607590e83350fd4feafde4cebcca7ad9f8485a9
Directory: 16/postgres-tomcat
-Tags: 16.4, 16.4.0, 16.4-mysql-tomcat, 16.4.0-mysql-tomcat
+Tags: 16.4, 16.4.1, 16.4-mysql-tomcat, 16.4.1-mysql-tomcat
Architectures: amd64, arm64v8
-GitCommit: 4607590e83350fd4feafde4cebcca7ad9f8485a9
+GitCommit: 1cfea6577f63263f4b7cacf8de13ebdd98f24ffa
Directory: 16.4/mysql-tomcat
-Tags: 16.4-mariadb-tomcat, 16.4.0-mariadb-tomcat
+Tags: 16.4-mariadb-tomcat, 16.4.1-mariadb-tomcat
Architectures: amd64, arm64v8
-GitCommit: 4607590e83350fd4feafde4cebcca7ad9f8485a9
+GitCommit: 1cfea6577f63263f4b7cacf8de13ebdd98f24ffa
Directory: 16.4/mariadb-tomcat
-Tags: 16.4-postgres-tomcat, 16.4.0-postgres-tomcat
+Tags: 16.4-postgres-tomcat, 16.4.1-postgres-tomcat
Architectures: amd64, arm64v8
-GitCommit: 4607590e83350fd4feafde4cebcca7ad9f8485a9
+GitCommit: 1cfea6577f63263f4b7cacf8de13ebdd98f24ffa
Directory: 16.4/postgres-tomcat
diff --git a/_bashbrew-list b/_bashbrew-list
index 46058a7..7207826 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -30,10 +30,10 @@ xwiki:16.4
xwiki:16.4-mariadb-tomcat
xwiki:16.4-mysql-tomcat
xwiki:16.4-postgres-tomcat
-xwiki:16.4.0
-xwiki:16.4.0-mariadb-tomcat
-xwiki:16.4.0-mysql-tomcat
-xwiki:16.4.0-postgres-tomcat
+xwiki:16.4.1
+xwiki:16.4.1-mariadb-tomcat
+xwiki:16.4.1-mysql-tomcat
+xwiki:16.4.1-postgres-tomcat
xwiki:16.5
xwiki:16.5-mariadb-tomcat
xwiki:16.5-mysql-tomcat
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index d9dc3d8..eff353f 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.0-mariadb-tomcat
-xwiki:16.4.0-mysql-tomcat
-xwiki:16.4.0-postgres-tomcat
+xwiki:16.4.1-mariadb-tomcat
+xwiki:16.4.1-mysql-tomcat
+xwiki:16.4.1-postgres-tomcat
xwiki:latest
xwiki:lts
xwiki:lts-mariadb
diff --git a/xwiki_16.4.0-mariadb-tomcat/Dockerfile b/xwiki_16.4.1-mariadb-tomcat/Dockerfile
similarity index 98%
rename from xwiki_16.4.0-mariadb-tomcat/Dockerfile
rename to xwiki_16.4.1-mariadb-tomcat/Dockerfile
index c2e93ef..8f458f3 100644
--- a/xwiki_16.4.0-mariadb-tomcat/Dockerfile
+++ b/xwiki_16.4.1-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.0"
+ENV XWIKI_VERSION="16.4.1"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 ced263c074f3a61384717cafa192a52aebd34db122e9467f69af2999ab3b600e
+ENV XWIKI_DOWNLOAD_SHA256 50d018ee5dc68a17d959403249307f8051a78055c04329d1e35cd03fc3b45e04
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.0-mariadb-tomcat/tomcat/setenv.sh b/xwiki_16.4.1-mariadb-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_16.4.0-mariadb-tomcat/tomcat/setenv.sh
rename to xwiki_16.4.1-mariadb-tomcat/tomcat/setenv.sh
diff --git a/xwiki_16.4.0-mariadb-tomcat/xwiki/docker-entrypoint.sh b/xwiki_16.4.1-mariadb-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_16.4.0-mariadb-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_16.4.1-mariadb-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_16.4.0-mariadb-tomcat/xwiki/hibernate.cfg.xml b/xwiki_16.4.1-mariadb-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_16.4.0-mariadb-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_16.4.1-mariadb-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_16.4.0-mysql-tomcat/Dockerfile b/xwiki_16.4.1-mysql-tomcat/Dockerfile
similarity index 98%
rename from xwiki_16.4.0-mysql-tomcat/Dockerfile
rename to xwiki_16.4.1-mysql-tomcat/Dockerfile
index 1036ae4..2bf4a43 100644
--- a/xwiki_16.4.0-mysql-tomcat/Dockerfile
+++ b/xwiki_16.4.1-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.0"
+ENV XWIKI_VERSION="16.4.1"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 ced263c074f3a61384717cafa192a52aebd34db122e9467f69af2999ab3b600e
+ENV XWIKI_DOWNLOAD_SHA256 50d018ee5dc68a17d959403249307f8051a78055c04329d1e35cd03fc3b45e04
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.0-mysql-tomcat/tomcat/setenv.sh b/xwiki_16.4.1-mysql-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_16.4.0-mysql-tomcat/tomcat/setenv.sh
rename to xwiki_16.4.1-mysql-tomcat/tomcat/setenv.sh
diff --git a/xwiki_16.4.0-mysql-tomcat/xwiki/docker-entrypoint.sh b/xwiki_16.4.1-mysql-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_16.4.0-mysql-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_16.4.1-mysql-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_16.4.0-mysql-tomcat/xwiki/hibernate.cfg.xml b/xwiki_16.4.1-mysql-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_16.4.0-mysql-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_16.4.1-mysql-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_16.4.0-postgres-tomcat/Dockerfile b/xwiki_16.4.1-postgres-tomcat/Dockerfile
similarity index 98%
rename from xwiki_16.4.0-postgres-tomcat/Dockerfile
rename to xwiki_16.4.1-postgres-tomcat/Dockerfile
index bc6fd84..561fff7 100644
--- a/xwiki_16.4.0-postgres-tomcat/Dockerfile
+++ b/xwiki_16.4.1-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="16.4.0"
+ENV XWIKI_VERSION="16.4.1"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 ced263c074f3a61384717cafa192a52aebd34db122e9467f69af2999ab3b600e
+ENV XWIKI_DOWNLOAD_SHA256 50d018ee5dc68a17d959403249307f8051a78055c04329d1e35cd03fc3b45e04
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.0-postgres-tomcat/tomcat/setenv.sh b/xwiki_16.4.1-postgres-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_16.4.0-postgres-tomcat/tomcat/setenv.sh
rename to xwiki_16.4.1-postgres-tomcat/tomcat/setenv.sh
diff --git a/xwiki_16.4.0-postgres-tomcat/xwiki/docker-entrypoint.sh b/xwiki_16.4.1-postgres-tomcat/xwiki/docker-entrypoint.sh
similarity index 97%
rename from xwiki_16.4.0-postgres-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_16.4.1-postgres-tomcat/xwiki/docker-entrypoint.sh
index c823eaa..3f097f5 100755
--- a/xwiki_16.4.0-postgres-tomcat/xwiki/docker-entrypoint.sh
+++ b/xwiki_16.4.1-postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -130,10 +130,7 @@ function configure() {
safesed "replacedatabase" $DB_DATABASE /usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/hibernate.cfg.xml
safesed "replacejdbcparams" $JDBC_PARAMS /usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/hibernate.cfg.xml
- # Set any non-default main wiki database name in the xwiki.cfg file.
- if [ "$DB_DATABASE" != "xwiki" ]; then
- xwiki_set_cfg "xwiki.db" $DB_DATABASE
- fi
+
echo ' Setting permanent directory...'
xwiki_set_properties 'environment.permanentDirectory' '/usr/local/xwiki/data'
diff --git a/xwiki_16.4.0-postgres-tomcat/xwiki/hibernate.cfg.xml b/xwiki_16.4.1-postgres-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_16.4.0-postgres-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_16.4.1-postgres-tomcat/xwiki/hibernate.cfg.xmlRelevant Maintainers:
|
tianon
approved these changes
Jul 5, 2024
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.