From 8821c1632fe4181f65fb79be7a61d756c8df3922 Mon Sep 17 00:00:00 2001 From: Nico Piel Date: Tue, 10 Nov 2026 11:33:58 +0100 Subject: [PATCH 1/2] Bump HikariCP to 7.1.0 2.5.1 is from 2016. 7.1.0 is the current release and runs on Java 11+; it needs only slf4j-api at runtime, which the build already ships (the metrics and javassist dependencies are optional and unused here). The calls in HikariConnectionPool are unchanged in 7.x: a connectionTimeout of 0 still means wait indefinitely, and ProxyConnection.unwrap(Connection.class) still returns the driver's connection. Behavior that does change comes from upstream defaults, such as idle connections now being pinged every two minutes (keepaliveTime). Signed-off-by: Nico Piel --- gradle/libs.versions.toml | 2 +- gradle/verification-metadata.xml | 10 +++++----- server/docs/thirdparty/THIRD-PARTY-README.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 789e7ac22d..9b95bd3414 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -127,7 +127,7 @@ hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" } hapi-structures-v27 = { module = "ca.uhn.hapi:hapi-structures-v27", version.ref = "hapi" } hapi-structures-v28 = { module = "ca.uhn.hapi:hapi-structures-v28", version.ref = "hapi" } hapi-structures-v281 = { module = "ca.uhn.hapi:hapi-structures-v281", version.ref = "hapi" } -hikaricp = { module = "com.zaxxer:HikariCP", version = "2.5.1" } +hikaricp = { module = "com.zaxxer:HikariCP", version = "7.1.0" } hk2-aopalliance-repackaged = { module = "org.glassfish.hk2.external:aopalliance-repackaged", version.ref = "hk2" } hk2-api = { module = "org.glassfish.hk2:hk2-api", version.ref = "hk2" } hk2-javax-inject = { module = "org.glassfish.hk2.external:javax.inject", version.ref = "hk2" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 04c10db547..f8b4917ad3 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -704,12 +704,12 @@ - - - + + + - - + + diff --git a/server/docs/thirdparty/THIRD-PARTY-README.txt b/server/docs/thirdparty/THIRD-PARTY-README.txt index 7ffd374932..76e1091890 100644 --- a/server/docs/thirdparty/THIRD-PARTY-README.txt +++ b/server/docs/thirdparty/THIRD-PARTY-README.txt @@ -26,7 +26,7 @@ The following are distributed under the terms of the Apache License version 2.0 Google Code libphonenumber (https://github.com/google/libphonenumber) Google Code Prettify (https://github.com/google/code-prettify) Guava 32.0.1 [incl. CLI] (https://github.com/google/guava) - HikariCP 2.5.1 + HikariCP 7.1.0 J2ObjC Annotations 1.3 (https://github.com/google/j2objc/) Jackson Project [incl. CLI] (https://github.com/FasterXML/jackson) Java Native Access (JNA) 4.5.2 (https://github.com/java-native-access/jna) From adab6dc727e892fe053fc5bee2376733ce1ca08a Mon Sep 17 00:00:00 2001 From: Nico Piel Date: Tue, 10 Nov 2026 11:33:59 +0100 Subject: [PATCH 2/2] Bump mybatis to 3.5.19 3.1.1 is from 2012. 3.5.19 is the last Java 8 release of the 3.5 line. 3.6.0 is only days old, so this stays on 3.5. OGNL and javassist are still shaded inside the mybatis jar, and nothing else is needed at runtime. The 3.5 line binds a simple parameterType's type handler from the declared type. User.selectPreferencesForUser declared java.lang.String but is called with the Integer user id, so it now declares java.lang.Integer in every database's mapper. Upstream Mirth made the same change when it moved to 3.5.15. DebugUsage.getDebugUsageStatistics and deleteDebugUsageStatistics declared java.lang.String but are called with a DebugUsage, so they now declare that class; they worked either way, because the serverId property they read is a String. The other String and Integer parameterTypes match what their callers pass. MyBatis stopped logging SQL under the java.sql loggers in 3.2 and logs each statement under its own ID instead, so the java.sql entry in log4j2.properties had no effect any more. logPrefix is now set, so every statement logs under mybatis.., and that entry now names mybatis, so one logger still controls all SQL logging. The comments there now explain how to log a single namespace and warn that DEBUG and TRACE can write sensitive data to the logs. THIRD-PARTY-README lists the OGNL 3.4.4 and Javassist 3.30.2-GA copies bundled inside the jar. OGNL 3.4.4 is Apache 2.0, and the 2004 BSD notice stays because the MyBatis NOTICE file reproduces it. mybatis-parent 15 was only the parent of 3.1.1, so its checksum entry is replaced by mybatis-parent 48, the parent of 3.5.19. Signed-off-by: Nico Piel Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Tony Germano --- gradle/libs.versions.toml | 2 +- gradle/verification-metadata.xml | 16 ++++++++-------- server/conf/log4j2.properties | 14 +++++++++++++- server/dbconf/SqlMapConfig.xml | 1 + server/dbconf/derby/derby-debugusage.xml | 4 ++-- server/dbconf/derby/derby-user.xml | 2 +- server/dbconf/mysql/mysql-debugusage.xml | 4 ++-- server/dbconf/mysql/mysql-user.xml | 2 +- server/dbconf/oracle/oracle-debugusage.xml | 4 ++-- server/dbconf/oracle/oracle-user.xml | 2 +- server/dbconf/postgres/postgres-debugusage.xml | 4 ++-- server/dbconf/postgres/postgres-user.xml | 2 +- server/dbconf/sqlserver/sqlserver-debugusage.xml | 4 ++-- server/dbconf/sqlserver/sqlserver-user.xml | 2 +- server/docs/thirdparty/THIRD-PARTY-README.txt | 13 ++++++++++--- 15 files changed, 48 insertions(+), 28 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9b95bd3414..e61703978a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -216,7 +216,7 @@ mimepull = { module = "org.jvnet.mimepull:mimepull", version = "1.9.7" } mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito" } mssql-jdbc = { module = "com.microsoft.sqlserver:mssql-jdbc", version = "10.2.4.jre11" } -mybatis = { module = "org.mybatis:mybatis", version = "3.1.1" } +mybatis = { module = "org.mybatis:mybatis", version = "3.5.19" } mysql-connector-j = { module = "com.mysql:mysql-connector-j", version = "8.4.0" } netty-buffer = { module = "io.netty:netty-buffer", version.ref = "netty" } netty-codec = { module = "io.netty:netty-codec", version.ref = "netty" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index f8b4917ad3..e21cee856b 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2786,17 +2786,17 @@ - - - + + + - - + + - - - + + + diff --git a/server/conf/log4j2.properties b/server/conf/log4j2.properties index 5afd444980..712eae9698 100644 --- a/server/conf/log4j2.properties +++ b/server/conf/log4j2.properties @@ -63,5 +63,17 @@ logger.shutdown.name = shutdown logger.shutdown.level = DEBUG # SQL Logging -logger.sql.name = java.sql +# MyBatis logs each statement under mybatis... +# DEBUG logs the SQL and its parameters; TRACE also logs every row returned. +# To log only one namespace, leave logger.sql at ERROR and add a logger for +# that namespace, for example: +# logger.sqlMessage.name = mybatis.Message +# logger.sqlMessage.level = DEBUG +# Core namespaces: Alert, Channel, CodeTemplate, Configuration, DebugUsage, +# Event, Message, Script, User. Plugins may add their own. +# WARNING: at DEBUG or TRACE, the logged parameters and rows can include +# message content (which may contain PHI), channel and server configuration +# (including passwords stored in it), and user credential hashes. Enable it +# only while troubleshooting, and protect or delete the resulting logs. +logger.sql.name = mybatis logger.sql.level = ERROR diff --git a/server/dbconf/SqlMapConfig.xml b/server/dbconf/SqlMapConfig.xml index 335b8c92ca..39a7560ba3 100644 --- a/server/dbconf/SqlMapConfig.xml +++ b/server/dbconf/SqlMapConfig.xml @@ -5,6 +5,7 @@ + diff --git a/server/dbconf/derby/derby-debugusage.xml b/server/dbconf/derby/derby-debugusage.xml index 4af0fb8deb..901e06fb54 100644 --- a/server/dbconf/derby/derby-debugusage.xml +++ b/server/dbconf/derby/derby-debugusage.xml @@ -12,7 +12,7 @@ - SELECT NAME AS "key", VALUE AS "value" FROM PERSON_PREFERENCE WHERE PERSON_ID = #{value} diff --git a/server/dbconf/mysql/mysql-debugusage.xml b/server/dbconf/mysql/mysql-debugusage.xml index 95e02e87e8..7b3513297f 100644 --- a/server/dbconf/mysql/mysql-debugusage.xml +++ b/server/dbconf/mysql/mysql-debugusage.xml @@ -12,7 +12,7 @@ + SELECT ID, SERVER_ID, @@ -66,7 +66,7 @@ WHERE SERVER_ID = #{serverId} - + DELETE FROM DEBUGGER_USAGE WHERE SERVER_ID = #{serverId} diff --git a/server/dbconf/oracle/oracle-user.xml b/server/dbconf/oracle/oracle-user.xml index 26aa1b9eec..7c288e3959 100644 --- a/server/dbconf/oracle/oracle-user.xml +++ b/server/dbconf/oracle/oracle-user.xml @@ -146,7 +146,7 @@ SET LOGGED_IN = 0 - SELECT NAME "key", VALUE "value" FROM PERSON_PREFERENCE WHERE PERSON_ID = #{value} diff --git a/server/dbconf/postgres/postgres-debugusage.xml b/server/dbconf/postgres/postgres-debugusage.xml index 4435148c60..1698a774c5 100644 --- a/server/dbconf/postgres/postgres-debugusage.xml +++ b/server/dbconf/postgres/postgres-debugusage.xml @@ -12,7 +12,7 @@ + SELECT ID, SERVER_ID, @@ -66,7 +66,7 @@ WHERE SERVER_ID = #{serverId} - + DELETE FROM DEBUGGER_USAGE WHERE SERVER_ID = #{serverId} diff --git a/server/dbconf/sqlserver/sqlserver-user.xml b/server/dbconf/sqlserver/sqlserver-user.xml index e68c201eee..8dbef7f216 100644 --- a/server/dbconf/sqlserver/sqlserver-user.xml +++ b/server/dbconf/sqlserver/sqlserver-user.xml @@ -145,7 +145,7 @@ SET LOGGED_IN = 0 - SELECT NAME AS "key", VALUE AS "value" FROM PERSON_PREFERENCE WHERE PERSON_ID = #{value} diff --git a/server/docs/thirdparty/THIRD-PARTY-README.txt b/server/docs/thirdparty/THIRD-PARTY-README.txt index 76e1091890..3e2f0f8d8e 100644 --- a/server/docs/thirdparty/THIRD-PARTY-README.txt +++ b/server/docs/thirdparty/THIRD-PARTY-README.txt @@ -33,9 +33,10 @@ The following are distributed under the terms of the Apache License version 2.0 Jetty 9.4.57 Joda-Time 2.9.9 JSR305 Annotations for Findbugs 3.0.2 (http://findbugs.sourceforge.net/) - MyBatis 3.1.1 + MyBatis 3.5.19 Netty 4.1.137 Not-Going-To-Be-Commons-SSL 0.3.18 + OGNL 3.4.4, included within the MyBatis 3.5.19 library Quartz Scheduler 2.3.2 SQLite JDBC Driver 3.43.2.1 (https://github.com/xerial/sqlite-jdbc) StAXON 1.3 [incl. CLI] (https://github.com/beckchr/staxon) @@ -80,6 +81,10 @@ terms. Javassist 3.26.0 [incl. CLI] (source code can be downloaded at: https://github.com/jboss-javassist/javassist/tree/rel_3_26_0_ga) + Javassist 3.30.2-GA, included within the MyBatis 3.5.19 library (source + code can be downloaded at: + https://github.com/jboss-javassist/javassist/tree/rel_3_30_2_ga) + -------------------------------------------------------------------------------- @@ -674,8 +679,10 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- -The license below pertains to OGNL (Object-Graph Navigation Language), which is -included within the MyBatis 3.1.1 library. +The notice below pertains to OGNL (Object-Graph Navigation Language), which is +included within the MyBatis 3.5.19 library. OGNL 3.4.4 is distributed under the +Apache License version 2.0; this notice is reproduced from the MyBatis NOTICE +file. =================== Beginning of License ===================