diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 66e6117a05..d1bf2f8d7a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -104,7 +104,7 @@ commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.20.0 commons-logging = { module = "commons-logging:commons-logging", version = "1.3.5" } commons-math3 = { module = "org.apache.commons:commons-math3", version = "3.0" } commons-net = { module = "commons-net:commons-net", version = "3.9.0" } -commons-pool2 = { module = "org.apache.commons:commons-pool2", version = "2.3" } +commons-pool2 = { module = "org.apache.commons:commons-pool2", version = "2.13.1" } commons-text = { module = "org.apache.commons:commons-text", version = "1.15.0" } commons-vfs2 = { module = "org.apache.commons:commons-vfs2", version = "2.10.0" } derby = { module = "org.apache.derby:derby", version.ref = "derby" } @@ -126,7 +126,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" } @@ -215,7 +215,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 04c10db547..ed10943a43 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -704,12 +704,12 @@ - - - + + + - - + + @@ -1481,11 +1481,6 @@ - - - - - @@ -1579,12 +1574,12 @@ - - - + + + - - + + @@ -2786,17 +2781,17 @@ - - - + + + - - + + - - - + + + diff --git a/server/dbconf/derby/derby-user.xml b/server/dbconf/derby/derby-user.xml index 19f5347115..8ba8ce9ca0 100644 --- a/server/dbconf/derby/derby-user.xml +++ b/server/dbconf/derby/derby-user.xml @@ -154,7 +154,7 @@ {call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('APP', 'PERSON', 0)} - SELECT NAME AS "key", VALUE AS "value" FROM PERSON_PREFERENCE WHERE PERSON_ID = #{value} diff --git a/server/dbconf/mysql/mysql-user.xml b/server/dbconf/mysql/mysql-user.xml index 1b0ea623d2..48888ab1b3 100644 --- a/server/dbconf/mysql/mysql-user.xml +++ b/server/dbconf/mysql/mysql-user.xml @@ -145,7 +145,7 @@ SET LOGGED_IN = FALSE - SELECT NAME AS "key", VALUE AS "value" FROM PERSON_PREFERENCE WHERE PERSON_ID = #{value} 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-user.xml b/server/dbconf/postgres/postgres-user.xml index aad9ebece7..8a7f194e71 100644 --- a/server/dbconf/postgres/postgres-user.xml +++ b/server/dbconf/postgres/postgres-user.xml @@ -131,7 +131,7 @@ SET LOGGED_IN = FALSE - SELECT NAME AS "key", VALUE AS "value" FROM PERSON_PREFERENCE WHERE PERSON_ID = #{value} 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 ae76828ea1..342255d67f 100644 --- a/server/docs/thirdparty/THIRD-PARTY-README.txt +++ b/server/docs/thirdparty/THIRD-PARTY-README.txt @@ -26,14 +26,14 @@ 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) 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 Quartz Scheduler 2.3.2 @@ -80,6 +80,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) + -------------------------------------------------------------------------------- @@ -706,7 +710,7 @@ 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. +included within the MyBatis 3.5.19 library. =================== Beginning of License ===================