From 4a26480f6c81ad028ca3ead11aa3518471a4091c Mon Sep 17 00:00:00 2001 From: "emmanuel.duchastenier@bonitasoft.com" Date: Fri, 1 Mar 2024 10:43:41 +0100 Subject: [PATCH 1/2] chore(cleanup): remove useless JMX options (#2877) According to https://docs.oracle.com/en/java/javase/11/management/monitoring-and-management-using-jmx-technology.html#GUID-096EA656-4D07-4B09-A493-9EDEF83ABF28 this option is no more necessary --- .../src/main/standalone/tomcat-templates/setenv.bat | 2 +- .../src/main/standalone/tomcat-templates/setenv.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-setup/src/main/standalone/tomcat-templates/setenv.bat b/platform/platform-setup/src/main/standalone/tomcat-templates/setenv.bat index 75b2a4905df..7576725f764 100644 --- a/platform/platform-setup/src/main/standalone/tomcat-templates/setenv.bat +++ b/platform/platform-setup/src/main/standalone/tomcat-templates/setenv.bat @@ -27,7 +27,7 @@ rem Optional JAAS configuration. Usually used when delegating authentication to rem set SECURITY_OPTS="-Djava.security.auth.login.config=%CATALINA_HOME%\conf\jaas-standard.cfg" rem Optional JMX remote access Configuration. Used to enable remote JMX agent in tomcat to monitor Heap Memory, Threads, CPU Usage, Classes, and configure various MBeans. -if "%JMX_REMOTE_ACCESS%" == "true" (set JMX_REMOTE_ACCESS_OPTS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9000 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.password.file=%CATALINA_HOME%\conf\jmxremote.password -Dcom.sun.management.jmxremote.access.file=%CATALINA_HOME%\conf\jmxremote.access") +if "%JMX_REMOTE_ACCESS%" == "true" (set JMX_REMOTE_ACCESS_OPTS="-Dcom.sun.management.jmxremote.port=9000 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.password.file=%CATALINA_HOME%\conf\jmxremote.password -Dcom.sun.management.jmxremote.access.file=%CATALINA_HOME%\conf\jmxremote.access") rem Pass the JVM system properties to Tomcat JVM using CATALINA_OPTS variable set CATALINA_OPTS=%CATALINA_OPTS% %LOG_CONF_FILE_PATH% %PLATFORM_SETUP% %XA_TIMEOUT_OPTS% %H2_DATABASE_DIR% %DB_OPTS% %BDM_DB_OPTS% %ARJUNA_OPTS% %INCIDENT_LOG_DIR% %JMX_REMOTE_ACCESS_OPTS% -Dfile.encoding=UTF-8 -Xshare:auto -Xms1024m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -Dlog4j2.formatMsgNoLookups=true diff --git a/platform/platform-setup/src/main/standalone/tomcat-templates/setenv.sh b/platform/platform-setup/src/main/standalone/tomcat-templates/setenv.sh index 7475a279431..33467d45291 100755 --- a/platform/platform-setup/src/main/standalone/tomcat-templates/setenv.sh +++ b/platform/platform-setup/src/main/standalone/tomcat-templates/setenv.sh @@ -28,7 +28,7 @@ XA_TIMEOUT_OPTS="-Dbonita.runtime.transaction.xa-timeout=${BONITA_RUNTIME_TRANSA # Optional JMX remote access Configuration. Used to enable remote JMX agent in tomcat to monitor Heap Memory, Threads, CPU Usage, Classes, and configure various MBeans. if [ "$JMX_REMOTE_ACCESS" = 'true' ]; then - JMX_REMOTE_ACCESS_OPTS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9000 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.password.file=${CATALINA_HOME}/conf/jmxremote.password -Dcom.sun.management.jmxremote.access.file=${CATALINA_HOME}/conf/jmxremote.access" + JMX_REMOTE_ACCESS_OPTS="-Dcom.sun.management.jmxremote.port=9000 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.password.file=${CATALINA_HOME}/conf/jmxremote.password -Dcom.sun.management.jmxremote.access.file=${CATALINA_HOME}/conf/jmxremote.access" fi # Pass the JVM system properties to Tomcat JVM using CATALINA_OPTS variable From 16bbd42a3c59539eda5baa29cf69dc4ea9b5dd93 Mon Sep 17 00:00:00 2001 From: abirembaut Date: Fri, 1 Mar 2024 17:03:34 +0100 Subject: [PATCH 2/2] chore(dependencies): update PostgreSQL driver (#2879) Covers [CVE-60](https://bonitasoft.atlassian.net/browse/CVE-60) --- buildSrc/src/main/groovy/Deps.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/Deps.groovy b/buildSrc/src/main/groovy/Deps.groovy index 2b7713691ca..fe82509acf6 100644 --- a/buildSrc/src/main/groovy/Deps.groovy +++ b/buildSrc/src/main/groovy/Deps.groovy @@ -33,7 +33,7 @@ class Deps { public static String mysqlVersion = "8.2.0" public static String mssqlVersion = "8.4.1.jre8" public static String oracleVersion = "19.3.0.0" - public static String postgresqlVersion = "42.4.3" + public static String postgresqlVersion = "42.4.4" public static String lombokVersion = "1.18.12" public static String narayanaVersion = "5.10.6.Final"