-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update XWiki LTS version to 15.10.16 #18249
Merged
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 2ec4cbf:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6515cb2..6584d2e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -16,19 +16,19 @@ Architectures: amd64, arm64v8
GitCommit: ffbda2123e322160254f342751bce9b978412e5f
Directory: 14/postgres-tomcat
-Tags: 15, 15.10, 15.10.15, 15-mysql-tomcat, 15.10-mysql-tomcat, 15.10.15-mysql-tomcat
+Tags: 15, 15.10, 15.10.16, 15-mysql-tomcat, 15.10-mysql-tomcat, 15.10.16-mysql-tomcat
Architectures: amd64, arm64v8
-GitCommit: c66e808ef276252268d4da9854438ca0357a485b
+GitCommit: fab7d75641c1be35a39ce4895178946a16a14f9b
Directory: 15/mysql-tomcat
-Tags: 15-mariadb-tomcat, 15.10-mariadb-tomcat, 15.10.15-mariadb-tomcat
+Tags: 15-mariadb-tomcat, 15.10-mariadb-tomcat, 15.10.16-mariadb-tomcat
Architectures: amd64, arm64v8
-GitCommit: c66e808ef276252268d4da9854438ca0357a485b
+GitCommit: fab7d75641c1be35a39ce4895178946a16a14f9b
Directory: 15/mariadb-tomcat
-Tags: 15-postgres-tomcat, 15.10-postgres-tomcat, 15.10.15-postgres-tomcat
+Tags: 15-postgres-tomcat, 15.10-postgres-tomcat, 15.10.16-postgres-tomcat
Architectures: amd64, arm64v8
-GitCommit: c66e808ef276252268d4da9854438ca0357a485b
+GitCommit: fab7d75641c1be35a39ce4895178946a16a14f9b
Directory: 15/postgres-tomcat
Tags: 16, 16.10, 16.10.2, 16-mysql-tomcat, 16.10-mysql-tomcat, 16.10.2-mysql-tomcat, mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts, stable-mysql-tomcat, stable-mysql, stable, latest
diff --git a/_bashbrew-list b/_bashbrew-list
index 42f931a..214be71 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -18,10 +18,10 @@ xwiki:15.10
xwiki:15.10-mariadb-tomcat
xwiki:15.10-mysql-tomcat
xwiki:15.10-postgres-tomcat
-xwiki:15.10.15
-xwiki:15.10.15-mariadb-tomcat
-xwiki:15.10.15-mysql-tomcat
-xwiki:15.10.15-postgres-tomcat
+xwiki:15.10.16
+xwiki:15.10.16-mariadb-tomcat
+xwiki:15.10.16-mysql-tomcat
+xwiki:15.10.16-postgres-tomcat
xwiki:16
xwiki:16-mariadb-tomcat
xwiki:16-mysql-tomcat
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index e5ee337..af74d54 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:15.10.15-mariadb-tomcat
-xwiki:15.10.15-mysql-tomcat
-xwiki:15.10.15-postgres-tomcat
+xwiki:15.10.16-mariadb-tomcat
+xwiki:15.10.16-mysql-tomcat
+xwiki:15.10.16-postgres-tomcat
xwiki:16.4.6-mariadb-tomcat
xwiki:16.4.6-mysql-tomcat
xwiki:16.4.6-postgres-tomcat
diff --git a/xwiki_15.10.15-mariadb-tomcat/Dockerfile b/xwiki_15.10.16-mariadb-tomcat/Dockerfile
similarity index 98%
rename from xwiki_15.10.15-mariadb-tomcat/Dockerfile
rename to xwiki_15.10.16-mariadb-tomcat/Dockerfile
index 0696f84..202ff7a 100644
--- a/xwiki_15.10.15-mariadb-tomcat/Dockerfile
+++ b/xwiki_15.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="15.10.15"
+ENV XWIKI_VERSION="15.10.16"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 93b63b968287f94751285517653083eb2a6da63d7e9af57b5bd7c398d9548033
+ENV XWIKI_DOWNLOAD_SHA256 c3a7bca6a05cf185ecfbea6df886c5764c6e0fcfdfce988498909911ebe98dda
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_15.10.15-mariadb-tomcat/tomcat/setenv.sh b/xwiki_15.10.16-mariadb-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_15.10.15-mariadb-tomcat/tomcat/setenv.sh
rename to xwiki_15.10.16-mariadb-tomcat/tomcat/setenv.sh
diff --git a/xwiki_15.10.15-mariadb-tomcat/xwiki/docker-entrypoint.sh b/xwiki_15.10.16-mariadb-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_15.10.15-mariadb-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_15.10.16-mariadb-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_15.10.15-mariadb-tomcat/xwiki/hibernate.cfg.xml b/xwiki_15.10.16-mariadb-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_15.10.15-mariadb-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_15.10.16-mariadb-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_15.10.15-mysql-tomcat/Dockerfile b/xwiki_15.10.16-mysql-tomcat/Dockerfile
similarity index 98%
rename from xwiki_15.10.15-mysql-tomcat/Dockerfile
rename to xwiki_15.10.16-mysql-tomcat/Dockerfile
index 8a60e07..ebc7a18 100644
--- a/xwiki_15.10.15-mysql-tomcat/Dockerfile
+++ b/xwiki_15.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="15.10.15"
+ENV XWIKI_VERSION="15.10.16"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 93b63b968287f94751285517653083eb2a6da63d7e9af57b5bd7c398d9548033
+ENV XWIKI_DOWNLOAD_SHA256 c3a7bca6a05cf185ecfbea6df886c5764c6e0fcfdfce988498909911ebe98dda
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_15.10.15-mysql-tomcat/tomcat/setenv.sh b/xwiki_15.10.16-mysql-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_15.10.15-mysql-tomcat/tomcat/setenv.sh
rename to xwiki_15.10.16-mysql-tomcat/tomcat/setenv.sh
diff --git a/xwiki_15.10.15-mysql-tomcat/xwiki/docker-entrypoint.sh b/xwiki_15.10.16-mysql-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_15.10.15-mysql-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_15.10.16-mysql-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_15.10.15-mysql-tomcat/xwiki/hibernate.cfg.xml b/xwiki_15.10.16-mysql-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_15.10.15-mysql-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_15.10.16-mysql-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_15.10.15-postgres-tomcat/Dockerfile b/xwiki_15.10.16-postgres-tomcat/Dockerfile
similarity index 98%
rename from xwiki_15.10.15-postgres-tomcat/Dockerfile
rename to xwiki_15.10.16-postgres-tomcat/Dockerfile
index 70b9217..241186e 100644
--- a/xwiki_15.10.15-postgres-tomcat/Dockerfile
+++ b/xwiki_15.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="15.10.15"
+ENV XWIKI_VERSION="15.10.16"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 93b63b968287f94751285517653083eb2a6da63d7e9af57b5bd7c398d9548033
+ENV XWIKI_DOWNLOAD_SHA256 c3a7bca6a05cf185ecfbea6df886c5764c6e0fcfdfce988498909911ebe98dda
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_15.10.15-postgres-tomcat/tomcat/setenv.sh b/xwiki_15.10.16-postgres-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_15.10.15-postgres-tomcat/tomcat/setenv.sh
rename to xwiki_15.10.16-postgres-tomcat/tomcat/setenv.sh
diff --git a/xwiki_15.10.15-postgres-tomcat/xwiki/docker-entrypoint.sh b/xwiki_15.10.16-postgres-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_15.10.15-postgres-tomcat/xwiki/docker-entrypoint.sh
rename to xwiki_15.10.16-postgres-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_15.10.15-postgres-tomcat/xwiki/hibernate.cfg.xml b/xwiki_15.10.16-postgres-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_15.10.15-postgres-tomcat/xwiki/hibernate.cfg.xml
rename to xwiki_15.10.16-postgres-tomcat/xwiki/hibernate.cfg.xml Relevant Maintainers:
|
tianon
approved these changes
Jan 16, 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.