XDOCKER-352: Upgrade stable version to 17.0.0 (#64)

- Remove branch 15.x
- Use tomcat:10.1-jre21 for 17
- Upgrade 16.10.x to jre21
- Extract dependency versions to separate objects to avoid duplication

Author: manuelleduc

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
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)

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
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)

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
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)

15/mariadb-tomcat/.env renamed to 17/mariadb-tomcat/.env

@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=15.10.16
+XWIKI_VERSION=17.0.0
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki

15/mariadb-tomcat/Dockerfile renamed to 17/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 && \

15/mariadb-tomcat/docker-compose.yml renamed to 17/mariadb-tomcat/docker-compose.yml

@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=15.10.16
+XWIKI_VERSION=17.0.0
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki

15/mariadb-tomcat/mariadb/init.sql renamed to 17/mariadb-tomcat/mariadb/init.sql

@@ -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}"

15/mariadb-tomcat/tomcat/setenv.sh renamed to 17/mariadb-tomcat/tomcat/setenv.sh

@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=15.10.16
+XWIKI_VERSION=17.0.0
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki

15/mariadb-tomcat/xwiki/docker-entrypoint.sh renamed to 17/mariadb-tomcat/xwiki/docker-entrypoint.sh

@@ -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 && \

15/mariadb-tomcat/xwiki/hibernate.cfg.xml renamed to 17/mariadb-tomcat/xwiki/hibernate.cfg.xml

@@ -45,46 +45,94 @@ def variants = ['mysql-tomcat', 'mariadb-tomcat', 'postgres-tomcat']
 //   - mariadb: https://github.com/xwiki/xwiki-platform/blob/master/pom.xml#L113 (link for master)
 //   - postgresql: https://github.com/xwiki/xwiki-platform/blob/master/pom.xml#L119 (link for master)
 
+// Versions of mysql, mariadb and postgres currently in use in the docker images.
+def mysql = [
+    '9': [
+        JDBCVersion: '9.1.0',
+        JDBCSha256: '8776e2ebc46072c9a47ea59d98298c4273bd9f16a7b26b5dfa4744535aa26c62'
+    ],
+    '8': [
+        JDBCVersion: '8.4.0',
+        JDBCSha256: 'd77962877d010777cff997015da90ee689f0f4bb76848340e1488f2b83332af5'
+    ]
+]
+
+def mariadb = [
+    '3.5': [
+        JDBCVersion: '3.5.1',
+        JDBCSha256: '50a50c4a3c13c30dfbd40587f7ad9a496197d285ede0948641d9eee68fdf2106'
+    ],
+    '3.4': [
+        JDBCVersion: '3.4.1',
+        JDBCSha256: 'f60e4b282f1f4bdb74f0a26436ba7078a5e480b6f6702f6a7b45d9ba5e604a24'
+    ]
+
+]
+
+def postgres = [
+    '42': [
+        JDBCVersion: '42.7.4',
+        JDBCSha256: '188976721ead8e8627eb6d8389d500dccc0c9bebd885268a3047180274a6031e'
+    ]
+]
+
 def tokens = [
+    '17': [
+        xwikiVersion: '17.0.0',
+        xwikiSha256: 'fd4d25b42c5645d87f7ed242967161ccb2648688948de93649a5ca11a1845c34',
+        mysqlJDBCVersion: mysql['9'].JDBCVersion,
+        mysqlJDBCSha256: mysql['9'].JDBCSha256,
+        mariadbJDBCVersion: mariadb['3.5'].JDBCVersion,
+        mariadbJDBCSha256: mariadb['3.5'].JDBCSha256,
+        postgresJDBCVersion: postgres['42'].JDBCVersion,
+        postgresJDBCSha256: postgres['42'].JDBCSha256,
+        tomcatImageTag: [
+            tomcatVersion: '10',
+            javaVersion: '21'
+        ]
+    ],
     '16': [
         xwikiVersion: '16.10.3',
         xwikiSha256: 'bf1f77ad964b2285c5a7695ae279bbb26f23df01ea83982bcc644af45a658405',
-        mysqlJDBCVersion: '9.1.0',
-        mysqlJDBCSha256: '8776e2ebc46072c9a47ea59d98298c4273bd9f16a7b26b5dfa4744535aa26c62',
-        mariadbJDBCVersion: '3.5.1',
-        mariadbJDBCSha256: '50a50c4a3c13c30dfbd40587f7ad9a496197d285ede0948641d9eee68fdf2106',
-        postgresJDBCVersion: '42.7.4',
-        postgresJDBCSha256: '188976721ead8e8627eb6d8389d500dccc0c9bebd885268a3047180274a6031e'
+        mysqlJDBCVersion: mysql['9'].JDBCVersion,
+        mysqlJDBCSha256: mysql['9'].JDBCSha256,
+        mariadbJDBCVersion: mariadb['3.5'].JDBCVersion,
+        mariadbJDBCSha256: mariadb['3.5'].JDBCSha256,
+        postgresJDBCVersion: postgres['42'].JDBCVersion,
+        postgresJDBCSha256: postgres['42'].JDBCSha256,
+        tomcatImageTag: [
+            tomcatVersion: '9',
+            javaVersion: '21'
+        ]
     ],
     '16.4': [
         xwikiVersion: '16.4.6',
         xwikiSha256: 'b41e9d29eafd31acdcf44c7ca5c81eacb2067ca129cf35391d10f493f6e623d3',
-        mysqlJDBCVersion: '8.4.0',
-        mysqlJDBCSha256: 'd77962877d010777cff997015da90ee689f0f4bb76848340e1488f2b83332af5',
-        mariadbJDBCVersion: '3.5.1',
-        mariadbJDBCSha256: '50a50c4a3c13c30dfbd40587f7ad9a496197d285ede0948641d9eee68fdf2106',
-        postgresJDBCVersion: '42.7.4',
-        postgresJDBCSha256: '188976721ead8e8627eb6d8389d500dccc0c9bebd885268a3047180274a6031e'
-    ],
-    '15': [
-        xwikiVersion: '15.10.16',
-        xwikiSha256: 'c3a7bca6a05cf185ecfbea6df886c5764c6e0fcfdfce988498909911ebe98dda',
-        mysqlJDBCVersion: '8.4.0',
-        mysqlJDBCSha256: 'd77962877d010777cff997015da90ee689f0f4bb76848340e1488f2b83332af5',
-        mariadbJDBCVersion: '3.5.1',
-        mariadbJDBCSha256: '50a50c4a3c13c30dfbd40587f7ad9a496197d285ede0948641d9eee68fdf2106',
-        postgresJDBCVersion: '42.7.4',
-        postgresJDBCSha256: '188976721ead8e8627eb6d8389d500dccc0c9bebd885268a3047180274a6031e'
+        mysqlJDBCVersion: mysql['8'].JDBCVersion,
+        mysqlJDBCSha256: mysql['8'].JDBCSha256,
+        mariadbJDBCVersion: mariadb['3.5'].JDBCVersion,
+        mariadbJDBCSha256: mariadb['3.5'].JDBCSha256,
+        postgresJDBCVersion: postgres['42'].JDBCVersion,
+        postgresJDBCSha256: postgres['42'].JDBCSha256,
+        tomcatImageTag: [
+            tomcatVersion: '9',
+            javaVersion: '17'
+        ]
+
     ],
     '14': [
         xwikiVersion: '14.10.21',
         xwikiSha256: '72a634e2aeb085878dce2629a3e5e6136887d0c22712dcee5a284be8143135ea',
-        mysqlJDBCVersion: '8.4.0',
-        mysqlJDBCSha256: 'd77962877d010777cff997015da90ee689f0f4bb76848340e1488f2b83332af5',
-        mariadbJDBCVersion: '3.4.1',
-        mariadbJDBCSha256: 'f60e4b282f1f4bdb74f0a26436ba7078a5e480b6f6702f6a7b45d9ba5e604a24',
-        postgresJDBCVersion: '42.7.4',
-        postgresJDBCSha256: '188976721ead8e8627eb6d8389d500dccc0c9bebd885268a3047180274a6031e'
+        mysqlJDBCVersion: mysql['8'].JDBCVersion,
+        mysqlJDBCSha256: mysql['8'].JDBCSha256,
+        mariadbJDBCVersion: mariadb['3.4'].JDBCVersion,
+        mariadbJDBCSha256: mariadb['3.4'].JDBCSha256,
+        postgresJDBCVersion: postgres['42'].JDBCVersion,
+        postgresJDBCSha256: postgres['42'].JDBCSha256,
+        tomcatImageTag: [
+            tomcatVersion: '9',
+            javaVersion: '17'
+        ]
     ]
 ]
 

15/mysql-tomcat/.env renamed to 17/mysql-tomcat/.env

@@ -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:${tomcatImageTag.tomcatVersion}-jre${tomcatImageTag.javaVersion}
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)