Merge branch 'master' into 'dev'

docker/files/config.sh

 #!/bin/bash
-set -x
+
+
 # Path to deploy the Tomcat Bundle
 BONITA_PATH=${BONITA_PATH:-/opt/bonita}
 # Templates directory
@@ -68,6 +69,7 @@ fi
 
 if [ "${ENSURE_DB_CHECK_AND_CREATION}" = 'true' ]
 then
+    echo "Creating (if missing) database and users"
 	# load SQL functions
 	. ${BONITA_FILES}/functions.sh
 	case "${DB_VENDOR}" in
@@ -117,6 +119,7 @@ find ${BONITA_PATH}/BonitaCommunity-${BRANDING_VERSION}/setup/platform_conf/init
     -e 's/^#platformAdminUsername\s*=.*/'"platformAdminUsername=${PLATFORM_LOGIN}"'/' \
     -e 's/^#platformAdminPassword\s*=.*/'"platformAdminPassword=${PLATFORM_PASSWORD}"'/'
 
+echo "Using JAVA_OPTS: ${JAVA_OPTS}"
 sed -i -e 's/{{JAVA_OPTS}}/'"${JAVA_OPTS}"'/' ${BONITA_PATH}/BonitaCommunity-${BRANDING_VERSION}/setup/tomcat-templates/setenv.sh
 
 if [ -n "$JDBC_DRIVER" ]
@@ -129,6 +132,12 @@ then
     fi
 fi
 
+echo "Using DB_VENDOR: ${DB_VENDOR}"
+echo "Using DB_NAME: ${DB_NAME}"
+echo "Using DB_HOST: ${DB_HOST}"
+echo "Using DB_PORT: ${DB_PORT}"
+echo "Using BIZ_DB_NAME: ${BIZ_DB_NAME}"
+
 sed -e 's/{{DB_VENDOR}}/'"${DB_VENDOR}"'/' \
     -e 's/{{DB_USER}}/'"${DB_USER}"'/' \
     -e 's/{{DB_PASS}}/'"${DB_PASS}"'/' \

pom.xml

@@ -28,8 +28,8 @@
         <bonita.web.version>${project.version}</bonita.web.version>
         <bonita.engine.version>${project.version}</bonita.engine.version>
 
-        <tomcat.version>8.5.59</tomcat.version>
-        <tomcat9.version>9.0.39</tomcat9.version>
+        <tomcat.version>8.5.68</tomcat.version>
+        <tomcat9.version>9.0.48</tomcat9.version>
         <slf4j.version>1.7.25</slf4j.version>
 
         <deploy_plugin_skip>false</deploy_plugin_skip>