Skip to content
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.11 #17066

Merged
merged 1 commit into from
Jun 27, 2024
Merged

Conversation

michitux
Copy link
Contributor

No description provided.

@michitux michitux requested a review from a team as a code owner June 27, 2024 13:13
Copy link

Diff for e26caad:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 68a0a66..46d310d 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.10, 15-mysql-tomcat, 15.10-mysql-tomcat, 15.10.10-mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts
+Tags: 15, 15.10, 15.10.11, 15-mysql-tomcat, 15.10-mysql-tomcat, 15.10.11-mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts
 Architectures: amd64, arm64v8
-GitCommit: 3885e1125214cbdc3dc1f6074cf89b762f9035e0
+GitCommit: e8e71bdac0660dd1a523c225860722ba05043075
 Directory: 15/mysql-tomcat
 
-Tags: 15-mariadb-tomcat, 15.10-mariadb-tomcat, 15.10.10-mariadb-tomcat, lts-mariadb-tomcat, lts-mariadb
+Tags: 15-mariadb-tomcat, 15.10-mariadb-tomcat, 15.10.11-mariadb-tomcat, lts-mariadb-tomcat, lts-mariadb
 Architectures: amd64, arm64v8
-GitCommit: 3885e1125214cbdc3dc1f6074cf89b762f9035e0
+GitCommit: e8e71bdac0660dd1a523c225860722ba05043075
 Directory: 15/mariadb-tomcat
 
-Tags: 15-postgres-tomcat, 15.10-postgres-tomcat, 15.10.10-postgres-tomcat, lts-postgres-tomcat, lts-postgres
+Tags: 15-postgres-tomcat, 15.10-postgres-tomcat, 15.10.11-postgres-tomcat, lts-postgres-tomcat, lts-postgres
 Architectures: amd64, arm64v8
-GitCommit: 3885e1125214cbdc3dc1f6074cf89b762f9035e0
+GitCommit: e8e71bdac0660dd1a523c225860722ba05043075
 Directory: 15/postgres-tomcat
 
 Tags: 16, 16.5, 16.5.0, 16-mysql-tomcat, 16.5-mysql-tomcat, 16.5.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
diff --git a/_bashbrew-list b/_bashbrew-list
index ef56309..46058a7 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.10
-xwiki:15.10.10-mariadb-tomcat
-xwiki:15.10.10-mysql-tomcat
-xwiki:15.10.10-postgres-tomcat
+xwiki:15.10.11
+xwiki:15.10.11-mariadb-tomcat
+xwiki:15.10.11-mysql-tomcat
+xwiki:15.10.11-postgres-tomcat
 xwiki:16
 xwiki:16-mariadb-tomcat
 xwiki:16-mysql-tomcat
diff --git a/xwiki_lts-mariadb/Dockerfile b/xwiki_lts-mariadb/Dockerfile
index 245bada..aee71dd 100644
--- a/xwiki_lts-mariadb/Dockerfile
+++ b/xwiki_lts-mariadb/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.10"
+ENV XWIKI_VERSION="15.10.11"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 fda9b5b4c1f471dc47e8cf2cb72b7550dbe6d6772887201be94c522a13b6078e
+ENV XWIKI_DOWNLOAD_SHA256 b69de0d6ae0d2cdd10efcd1913065f750de62b5147f553bc6772e42cc66e2e2c
 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.3.3"
-ENV MARIADB_JDBC_SHA256="89d71a6ffd800c032b23e588108688d391631f0aba962ba2381cc82cb111b796"
+ENV MARIADB_JDBC_VERSION="3.4.0"
+ENV MARIADB_JDBC_SHA256="d83970dcda3198ca480e59b38e9e7055df09833e40d898c8ec5778a1e767f93b"
 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_lts-postgres/Dockerfile b/xwiki_lts-postgres/Dockerfile
index 0652eca..1c48073 100644
--- a/xwiki_lts-postgres/Dockerfile
+++ b/xwiki_lts-postgres/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.10.10"
+ENV XWIKI_VERSION="15.10.11"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 fda9b5b4c1f471dc47e8cf2cb72b7550dbe6d6772887201be94c522a13b6078e
+ENV XWIKI_DOWNLOAD_SHA256 b69de0d6ae0d2cdd10efcd1913065f750de62b5147f553bc6772e42cc66e2e2c
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_lts/Dockerfile b/xwiki_lts/Dockerfile
index 4fa4de5..afac726 100644
--- a/xwiki_lts/Dockerfile
+++ b/xwiki_lts/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.10"
+ENV XWIKI_VERSION="15.10.11"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 fda9b5b4c1f471dc47e8cf2cb72b7550dbe6d6772887201be94c522a13b6078e
+ENV XWIKI_DOWNLOAD_SHA256 b69de0d6ae0d2cdd10efcd1913065f750de62b5147f553bc6772e42cc66e2e2c
 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 MYSQL_JDBC_VERSION="8.3.0"
-ENV MYSQL_JDBC_SHA256="94e7fa815370cdcefed915db7f53f88445fac110f8c3818392b992ec9ee6d295"
+ENV MYSQL_JDBC_VERSION="8.4.0"
+ENV MYSQL_JDBC_SHA256="d77962877d010777cff997015da90ee689f0f4bb76848340e1488f2b83332af5"
 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}"

Relevant Maintainers:

@tianon tianon merged commit 60943db into docker-library:master Jun 27, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants