XWiki 16.6.0 release

[tmortagne]

No description provided.

[github-actions]

Diff for 02cbedd:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index e3eeb07..9a90467 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -31,19 +31,19 @@ Architectures: amd64, arm64v8
 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
+Tags: 16, 16.6, 16.6.0, 16-mysql-tomcat, 16.6-mysql-tomcat, 16.6.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
 Architectures: amd64, arm64v8
-GitCommit: 4607590e83350fd4feafde4cebcca7ad9f8485a9
+GitCommit: afc65b45fe60fe55d109e2b701ac2b1e7eee779b
 Directory: 16/mysql-tomcat
 
-Tags: 16-mariadb-tomcat, 16.5-mariadb-tomcat, 16.5.0-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb
+Tags: 16-mariadb-tomcat, 16.6-mariadb-tomcat, 16.6.0-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb
 Architectures: amd64, arm64v8
-GitCommit: 4607590e83350fd4feafde4cebcca7ad9f8485a9
+GitCommit: afc65b45fe60fe55d109e2b701ac2b1e7eee779b
 Directory: 16/mariadb-tomcat
 
-Tags: 16-postgres-tomcat, 16.5-postgres-tomcat, 16.5.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
+Tags: 16-postgres-tomcat, 16.6-postgres-tomcat, 16.6.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
 Architectures: amd64, arm64v8
-GitCommit: 4607590e83350fd4feafde4cebcca7ad9f8485a9
+GitCommit: afc65b45fe60fe55d109e2b701ac2b1e7eee779b
 Directory: 16/postgres-tomcat
 
 Tags: 16.4, 16.4.1, 16.4-mysql-tomcat, 16.4.1-mysql-tomcat
diff --git a/_bashbrew-list b/_bashbrew-list
index 7207826..804750e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -34,14 +34,14 @@ 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
-xwiki:16.5-postgres-tomcat
-xwiki:16.5.0
-xwiki:16.5.0-mariadb-tomcat
-xwiki:16.5.0-mysql-tomcat
-xwiki:16.5.0-postgres-tomcat
+xwiki:16.6
+xwiki:16.6-mariadb-tomcat
+xwiki:16.6-mysql-tomcat
+xwiki:16.6-postgres-tomcat
+xwiki:16.6.0
+xwiki:16.6.0-mariadb-tomcat
+xwiki:16.6.0-mysql-tomcat
+xwiki:16.6.0-postgres-tomcat
 xwiki:latest
 xwiki:lts
 xwiki:lts-mariadb
diff --git a/xwiki_latest/Dockerfile b/xwiki_latest/Dockerfile
index 60de194..695031a 100644
--- a/xwiki_latest/Dockerfile
+++ b/xwiki_latest/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.5.0"
+ENV XWIKI_VERSION="16.6.0"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 0997ff4cfe16928996218963fad74d7a564c1aa75c7e8434e7cd25bd471ecd5a
+ENV XWIKI_DOWNLOAD_SHA256 504e3fc3707d222d4a2be7c4e51e01242d4a7092380234d5076616d170390fe7
 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.0.0"
+ENV MYSQL_JDBC_SHA256="a221c4106b7fe68a45912cdbf8351f1b43ad3c53a43c3bc966181cc14f86fa30"
 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}"
diff --git a/xwiki_latest/xwiki/docker-entrypoint.sh b/xwiki_latest/xwiki/docker-entrypoint.sh
index f1381d0..33cb7aa 100755
--- a/xwiki_latest/xwiki/docker-entrypoint.sh
+++ b/xwiki_latest/xwiki/docker-entrypoint.sh
@@ -37,7 +37,11 @@ function other_starts() {
 # $2 - the setting/property to set
 # $3 - the new value
 function xwiki_replace() {
-  sed -i s~"\#\? \?$2 \?=.*"~"$2=$3"~g "$1"
+  # Don't use "sed -i" as it creates a temporary file and perform a rename (thus changing the inode of the initial file)
+  # which makes it fail if you map the initial file as a Docker volume mount.
+  sed s~"\#\? \?$2 \?=.*"~"$2=$3"~g "$1" > "$1.old"
+  cp "$1.old" "$1"
+  rm "$1.old"
 }
 
 # $1 - the setting/property to set
@@ -79,7 +83,11 @@ file_env() {
 # $2 - the replacement text
 # $3 - the file in which to do the search/replace
 function safesed {
-  sed -i "s/$(echo $1 | sed -e 's/\([[\/.*]\|\]\)/\\&/g')/$(echo $2 | sed -e 's/[\/&]/\\&/g')/g" $3
+  # Don't use "sed -i" as it creates a temporary file and perform a rename (thus changing the inode of the initial file)
+  # which makes it fail if you map the initial file as a Docker volume mount.
+  sed "s/$(echo $1 | sed -e 's/\([[\/.*]\|\]\)/\\&/g')/$(echo $2 | sed -e 's/[\/&]/\\&/g')/g" "$3" > "$3.old"
+  cp "$3.old" "$3"
+  rm "$3.old"
 }
 
 # $1 - the config file name found in WEB-INF (e.g. "xwiki.cfg")
@@ -87,9 +95,6 @@ function saveConfigurationFile() {
   if [ -f "/usr/local/xwiki/data/$1" ]; then
      echo "  Reusing existing config file $1..."
      cp "/usr/local/xwiki/data/$1" "/usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/$1"
-  else
-     echo "  Saving config file $1..."
-     cp "/usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/$1" "/usr/local/xwiki/data/$1"
   fi
 }
 
@@ -98,9 +103,6 @@ function restoreConfigurationFile() {
   if [ -f "/usr/local/xwiki/data/$1" ]; then
      echo "  Synchronizing config file $1..."
      cp "/usr/local/xwiki/data/$1" "/usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/$1"
-  else
-     echo "  No config file $1 found, using default from container..."
-     cp "/usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/$1" "/usr/local/xwiki/data/$1"
   fi
 }
 
@@ -146,9 +148,7 @@ function configure() {
     xwiki_set_properties 'solr.remote.url' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
   fi
 
-  # If the files already exist then copy them to the XWiki's WEB-INF directory. Otherwise copy the default config
-  # files to the permanent directory so that they can be easily modified by the user. They'll be synced at the next
-  # start.
+  # If the files already exist then copy them to the XWiki's WEB-INF directory.
   mkdir -p /usr/local/xwiki/data
   saveConfigurationFile 'hibernate.cfg.xml'
   saveConfigurationFile 'xwiki.cfg'
diff --git a/xwiki_stable-mariadb/Dockerfile b/xwiki_stable-mariadb/Dockerfile
index 3fcace6..78799af 100644
--- a/xwiki_stable-mariadb/Dockerfile
+++ b/xwiki_stable-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="16.5.0"
+ENV XWIKI_VERSION="16.6.0"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 0997ff4cfe16928996218963fad74d7a564c1aa75c7e8434e7cd25bd471ecd5a
+ENV XWIKI_DOWNLOAD_SHA256 504e3fc3707d222d4a2be7c4e51e01242d4a7092380234d5076616d170390fe7
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_stable-mariadb/xwiki/docker-entrypoint.sh b/xwiki_stable-mariadb/xwiki/docker-entrypoint.sh
index 9454a87..c3c995b 100755
--- a/xwiki_stable-mariadb/xwiki/docker-entrypoint.sh
+++ b/xwiki_stable-mariadb/xwiki/docker-entrypoint.sh
@@ -37,7 +37,11 @@ function other_starts() {
 # $2 - the setting/property to set
 # $3 - the new value
 function xwiki_replace() {
-  sed -i s~"\#\? \?$2 \?=.*"~"$2=$3"~g "$1"
+  # Don't use "sed -i" as it creates a temporary file and perform a rename (thus changing the inode of the initial file)
+  # which makes it fail if you map the initial file as a Docker volume mount.
+  sed s~"\#\? \?$2 \?=.*"~"$2=$3"~g "$1" > "$1.old"
+  cp "$1.old" "$1"
+  rm "$1.old"
 }
 
 # $1 - the setting/property to set
@@ -79,7 +83,11 @@ file_env() {
 # $2 - the replacement text
 # $3 - the file in which to do the search/replace
 function safesed {
-  sed -i "s/$(echo $1 | sed -e 's/\([[\/.*]\|\]\)/\\&/g')/$(echo $2 | sed -e 's/[\/&]/\\&/g')/g" $3
+  # Don't use "sed -i" as it creates a temporary file and perform a rename (thus changing the inode of the initial file)
+  # which makes it fail if you map the initial file as a Docker volume mount.
+  sed "s/$(echo $1 | sed -e 's/\([[\/.*]\|\]\)/\\&/g')/$(echo $2 | sed -e 's/[\/&]/\\&/g')/g" "$3" > "$3.old"
+  cp "$3.old" "$3"
+  rm "$3.old"
 }
 
 # $1 - the config file name found in WEB-INF (e.g. "xwiki.cfg")
@@ -87,9 +95,6 @@ function saveConfigurationFile() {
   if [ -f "/usr/local/xwiki/data/$1" ]; then
      echo "  Reusing existing config file $1..."
      cp "/usr/local/xwiki/data/$1" "/usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/$1"
-  else
-     echo "  Saving config file $1..."
-     cp "/usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/$1" "/usr/local/xwiki/data/$1"
   fi
 }
 
@@ -98,9 +103,6 @@ function restoreConfigurationFile() {
   if [ -f "/usr/local/xwiki/data/$1" ]; then
      echo "  Synchronizing config file $1..."
      cp "/usr/local/xwiki/data/$1" "/usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/$1"
-  else
-     echo "  No config file $1 found, using default from container..."
-     cp "/usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/$1" "/usr/local/xwiki/data/$1"
   fi
 }
 
@@ -146,9 +148,7 @@ function configure() {
     xwiki_set_properties 'solr.remote.url' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
   fi
 
-  # If the files already exist then copy them to the XWiki's WEB-INF directory. Otherwise copy the default config
-  # files to the permanent directory so that they can be easily modified by the user. They'll be synced at the next
-  # start.
+  # If the files already exist then copy them to the XWiki's WEB-INF directory.
   mkdir -p /usr/local/xwiki/data
   saveConfigurationFile 'hibernate.cfg.xml'
   saveConfigurationFile 'xwiki.cfg'
diff --git a/xwiki_stable-postgres/Dockerfile b/xwiki_stable-postgres/Dockerfile
index b11e939..4987c86 100644
--- a/xwiki_stable-postgres/Dockerfile
+++ b/xwiki_stable-postgres/Dockerfile
@@ -42,16 +42,15 @@ RUN apt-get update && \
     curl \
     libreoffice \
     unzip \
-    procps \
-    libpostgresql-jdbc-java && \
+    procps && \
   rm -rf /var/lib/apt/lists/*
 
 # Install XWiki as the ROOT webapp context in Tomcat
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
-ENV XWIKI_VERSION="16.5.0"
+ENV XWIKI_VERSION="16.6.0"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 0997ff4cfe16928996218963fad74d7a564c1aa75c7e8434e7cd25bd471ecd5a
+ENV XWIKI_DOWNLOAD_SHA256 504e3fc3707d222d4a2be7c4e51e01242d4a7092380234d5076616d170390fe7
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_stable-postgres/xwiki/docker-entrypoint.sh b/xwiki_stable-postgres/xwiki/docker-entrypoint.sh
index c823eaa..c93f58c 100755
--- a/xwiki_stable-postgres/xwiki/docker-entrypoint.sh
+++ b/xwiki_stable-postgres/xwiki/docker-entrypoint.sh
@@ -37,7 +37,11 @@ function other_starts() {
 # $2 - the setting/property to set
 # $3 - the new value
 function xwiki_replace() {
-  sed -i s~"\#\? \?$2 \?=.*"~"$2=$3"~g "$1"
+  # Don't use "sed -i" as it creates a temporary file and perform a rename (thus changing the inode of the initial file)
+  # which makes it fail if you map the initial file as a Docker volume mount.
+  sed s~"\#\? \?$2 \?=.*"~"$2=$3"~g "$1" > "$1.old"
+  cp "$1.old" "$1"
+  rm "$1.old"
 }
 
 # $1 - the setting/property to set
@@ -79,7 +83,11 @@ file_env() {
 # $2 - the replacement text
 # $3 - the file in which to do the search/replace
 function safesed {
-  sed -i "s/$(echo $1 | sed -e 's/\([[\/.*]\|\]\)/\\&/g')/$(echo $2 | sed -e 's/[\/&]/\\&/g')/g" $3
+  # Don't use "sed -i" as it creates a temporary file and perform a rename (thus changing the inode of the initial file)
+  # which makes it fail if you map the initial file as a Docker volume mount.
+  sed "s/$(echo $1 | sed -e 's/\([[\/.*]\|\]\)/\\&/g')/$(echo $2 | sed -e 's/[\/&]/\\&/g')/g" "$3" > "$3.old"
+  cp "$3.old" "$3"
+  rm "$3.old"
 }
 
 # $1 - the config file name found in WEB-INF (e.g. "xwiki.cfg")
@@ -87,9 +95,6 @@ function saveConfigurationFile() {
   if [ -f "/usr/local/xwiki/data/$1" ]; then
      echo "  Reusing existing config file $1..."
      cp "/usr/local/xwiki/data/$1" "/usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/$1"
-  else
-     echo "  Saving config file $1..."
-     cp "/usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/$1" "/usr/local/xwiki/data/$1"
   fi
 }
 
@@ -98,9 +103,6 @@ function restoreConfigurationFile() {
   if [ -f "/usr/local/xwiki/data/$1" ]; then
      echo "  Synchronizing config file $1..."
      cp "/usr/local/xwiki/data/$1" "/usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/$1"
-  else
-     echo "  No config file $1 found, using default from container..."
-     cp "/usr/local/tomcat/webapps/$CONTEXT_PATH/WEB-INF/$1" "/usr/local/xwiki/data/$1"
   fi
 }
 
@@ -130,10 +132,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'
@@ -146,9 +145,7 @@ function configure() {
     xwiki_set_properties 'solr.remote.url' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
   fi
 
-  # If the files already exist then copy them to the XWiki's WEB-INF directory. Otherwise copy the default config
-  # files to the permanent directory so that they can be easily modified by the user. They'll be synced at the next
-  # start.
+  # If the files already exist then copy them to the XWiki's WEB-INF directory.
   mkdir -p /usr/local/xwiki/data
   saveConfigurationFile 'hibernate.cfg.xml'
   saveConfigurationFile 'xwiki.cfg'

Relevant Maintainers:

• xwiki: @xwiki