Compare revisions

Vincent Massol · Manuel Leduc · 38192687 · 38192687 · 38192687 · 38192687
--- a/16/mariadb-tomcat/.env
+++ b/16/mariadb-tomcat/.env
 # Default environment values
-XWIKI_VERSION=16.10.2
+XWIKI_VERSION=16.10.3
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki

--- a/16/mariadb-tomcat/Dockerfile
+++ b/16/mariadb-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jre17
+FROM tomcat:9-jre21

 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -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.2"
+ENV XWIKI_VERSION="16.10.3"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 1a6287416db4243e3d40939e19509ca4ebe9e4f46f8fcf7204f223bcfff8b6e2
+ENV XWIKI_DOWNLOAD_SHA256 bf1f77ad964b2285c5a7695ae279bbb26f23df01ea83982bcc644af45a658405
 RUN rm -rf /usr/local/tomcat/webapps/* && \
  mkdir -p /usr/local/tomcat/temp && \
  mkdir -p /usr/local/xwiki/data && \

--- a/16/mysql-tomcat/.env
+++ b/16/mysql-tomcat/.env
 # Default environment values
-XWIKI_VERSION=16.10.2
+XWIKI_VERSION=16.10.3
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki

--- a/16/mysql-tomcat/Dockerfile
+++ b/16/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jre17
+FROM tomcat:9-jre21

 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -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.2"
+ENV XWIKI_VERSION="16.10.3"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 1a6287416db4243e3d40939e19509ca4ebe9e4f46f8fcf7204f223bcfff8b6e2
+ENV XWIKI_DOWNLOAD_SHA256 bf1f77ad964b2285c5a7695ae279bbb26f23df01ea83982bcc644af45a658405
 RUN rm -rf /usr/local/tomcat/webapps/* && \
  mkdir -p /usr/local/tomcat/temp && \
  mkdir -p /usr/local/xwiki/data && \

--- a/16/postgres-tomcat/.env
+++ b/16/postgres-tomcat/.env
 # Default environment values
-XWIKI_VERSION=16.10.2
+XWIKI_VERSION=16.10.3
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki

--- a/16/postgres-tomcat/Dockerfile
+++ b/16/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jre17
+FROM tomcat:9-jre21

 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -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.2"
+ENV XWIKI_VERSION="16.10.3"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 1a6287416db4243e3d40939e19509ca4ebe9e4f46f8fcf7204f223bcfff8b6e2
+ENV XWIKI_DOWNLOAD_SHA256 bf1f77ad964b2285c5a7695ae279bbb26f23df01ea83982bcc644af45a658405
 RUN rm -rf /usr/local/tomcat/webapps/* && \
  mkdir -p /usr/local/tomcat/temp && \
  mkdir -p /usr/local/xwiki/data && \

--- a/15/mariadb-tomcat/.env
+++ b/15/mariadb-tomcat/.env
 # Default environment values
-XWIKI_VERSION=15.10.16
+XWIKI_VERSION=17.0.0
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki

--- a/15/mariadb-tomcat/Dockerfile
+++ b/15/mariadb-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jre17
+FROM tomcat:10-jre21

 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -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.16"
+ENV XWIKI_VERSION="17.0.0"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 c3a7bca6a05cf185ecfbea6df886c5764c6e0fcfdfce988498909911ebe98dda
+ENV XWIKI_DOWNLOAD_SHA256 fd4d25b42c5645d87f7ed242967161ccb2648688948de93649a5ca11a1845c34
 RUN rm -rf /usr/local/tomcat/webapps/* && \
  mkdir -p /usr/local/tomcat/temp && \
  mkdir -p /usr/local/xwiki/data && \

--- a/15/mariadb-tomcat/docker-compose.yml
+++ b/15/mariadb-tomcat/docker-compose.yml
--- a/15/mariadb-tomcat/mariadb/init.sql
+++ b/15/mariadb-tomcat/mariadb/init.sql
--- a/15/mariadb-tomcat/tomcat/setenv.sh
+++ b/15/mariadb-tomcat/tomcat/setenv.sh
--- a/15/mariadb-tomcat/xwiki/docker-entrypoint.sh
+++ b/15/mariadb-tomcat/xwiki/docker-entrypoint.sh
--- a/15/mariadb-tomcat/xwiki/hibernate.cfg.xml
+++ b/15/mariadb-tomcat/xwiki/hibernate.cfg.xml
--- a/15/mysql-tomcat/.env
+++ b/15/mysql-tomcat/.env
 # Default environment values
-XWIKI_VERSION=15.10.16
+XWIKI_VERSION=17.0.0
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki

--- a/15/mysql-tomcat/Dockerfile
+++ b/15/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9-jre17
+FROM tomcat:10-jre21

 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -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.16"
+ENV XWIKI_VERSION="17.0.0"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 c3a7bca6a05cf185ecfbea6df886c5764c6e0fcfdfce988498909911ebe98dda
+ENV XWIKI_DOWNLOAD_SHA256 fd4d25b42c5645d87f7ed242967161ccb2648688948de93649a5ca11a1845c34
 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.4.0"
-ENV MYSQL_JDBC_SHA256="d77962877d010777cff997015da90ee689f0f4bb76848340e1488f2b83332af5"
+ENV MYSQL_JDBC_VERSION="9.1.0"
+ENV MYSQL_JDBC_SHA256="8776e2ebc46072c9a47ea59d98298c4273bd9f16a7b26b5dfa4744535aa26c62"
 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}"

--- a/15/mysql-tomcat/docker-compose.yml
+++ b/15/mysql-tomcat/docker-compose.yml
--- a/15/mysql-tomcat/mysql/init.sql
+++ b/15/mysql-tomcat/mysql/init.sql
--- a/15/mysql-tomcat/tomcat/setenv.sh
+++ b/15/mysql-tomcat/tomcat/setenv.sh
--- a/15/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/15/mysql-tomcat/xwiki/docker-entrypoint.sh
--- a/15/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/15/mysql-tomcat/xwiki/hibernate.cfg.xml
No results found