Skip to content

Bump HikariCP, commons-pool2 and MyBatis #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
NicoPiel wants to merge 3 commits into
base: main
Choose a base branch
from
+33 −34
Draft

Bump HikariCP, commons-pool2 and MyBatis #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99c0f97
Bump HikariCP to 7.1.0
NicoPiel Oct 29, 2026
b8f3058
Bump commons-pool2 to 2.13.1
NicoPiel Oct 29, 2026
83622e2
Bump mybatis to 3.5.19
NicoPiel Oct 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,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" }
Expand All @@ -115,7 +115,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" }
Expand Down Expand Up @@ -210,7 +210,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" }
Expand Down
41 changes: 18 additions & 23 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,12 +745,12 @@
<sha256 value="e267e6ac9582d2751c86857cab9923a11dfd5027dc84af973246c855203ca1c0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.zaxxer" name="HikariCP" version="2.5.1">
<artifact name="HikariCP-2.5.1.jar">
<sha256 value="3cf7bc5258414b77613e8d8ef0ce63b3ae1c53a441fd95b9ea335ec051c652b2" origin="Generated by Gradle"/>
<component group="com.zaxxer" name="HikariCP" version="7.1.0">
<artifact name="HikariCP-7.1.0.jar">
<sha256 value="2be45c641b841e81df87292e181f2c203500c5f0e9a1676f135927387f3cf40b" origin="Generated by Gradle"/>
</artifact>
<artifact name="HikariCP-2.5.1.pom">
<sha256 value="4125e107c541e1e93e9e41b8d26b0a3e1e37cd6ca5730b9440fb5e0b0b6d44a7" origin="Generated by Gradle"/>
<artifact name="HikariCP-7.1.0.pom">
<sha256 value="5b8df2699933ea898aa50d4def4fc2226b15e6f4d993e373a16070f7ed480216" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-beanutils" name="commons-beanutils" version="1.11.0">
Expand Down Expand Up @@ -1522,11 +1522,6 @@
<sha256 value="53d0011352e2e5106f379dafccdac7754ec6f0f78243c0305e4969f5acddf8fb" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-parent" version="34">
<artifact name="commons-parent-34.pom">
<sha256 value="3a2e69d06d641d1f3b293126dc9e2e4ea6563bf8c36c87e0ab6fa4292d04b79c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-parent" version="39">
<artifact name="commons-parent-39.pom">
<sha256 value="87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -1620,12 +1615,12 @@
<sha256 value="4a961c2f7718508716618ad31fb41cb7a5cb749428ad0a19b8ff4d0d7f0b0934" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-pool2" version="2.3">
<artifact name="commons-pool2-2.3.jar">
<sha256 value="3e794e75be78f63cc31b6676697e45f07085903a1039169459132513d85c62ae" origin="Generated by Gradle"/>
<component group="org.apache.commons" name="commons-pool2" version="2.13.1">
<artifact name="commons-pool2-2.13.1.jar">
<sha256 value="f77a5060d6936a9144023584232f9de3f2248f1abfe156e9d31795f18770674f" origin="Generated by Gradle"/>
</artifact>
<artifact name="commons-pool2-2.3.pom">
<sha256 value="256b8598d469b7b20f92fd70406774d14b913b25affa02cd9488ddf6d1d3d55b" origin="Generated by Gradle"/>
<artifact name="commons-pool2-2.13.1.pom">
<sha256 value="89de9c86af44f8163f6a826eb71b80c93e90479de8b8d9229bc243e5a48e5e03" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-text" version="1.15.0">
Expand Down Expand Up @@ -2806,17 +2801,17 @@
<sha256 value="75f51406de4eb508b7614de4f2b447447570d1f63dbd90c59d87655e3681e2f2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.mybatis" name="mybatis" version="3.1.1">
<artifact name="mybatis-3.1.1.jar">
<sha256 value="3d5561088062ba69fa8865add891dcb856600fbfa255f28504c370503108afb6" origin="Generated by Gradle"/>
<component group="org.mybatis" name="mybatis" version="3.5.19">
<artifact name="mybatis-3.5.19.jar">
<sha256 value="93eea616ae355751bd5fbabb57f0732713fbe79f3196f33c51a0aeeb4255862a" origin="Generated by Gradle"/>
</artifact>
<artifact name="mybatis-3.1.1.pom">
<sha256 value="f68d654f21587b5446b888000c56846750fa3ac1ec10788ef23ec181057b4a95" origin="Generated by Gradle"/>
<artifact name="mybatis-3.5.19.pom">
<sha256 value="3e70093e8a67a7584154fd78b8c3846d742d9520b679b337429136dcad4ba271" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.mybatis" name="mybatis-parent" version="15">
<artifact name="mybatis-parent-15.pom">
<sha256 value="26a6acf683388b150774143fae3b3887657858ca133703e523888b575067db61" origin="Generated by Gradle"/>
<component group="org.mybatis" name="mybatis-parent" version="48">
<artifact name="mybatis-parent-48.pom">
<sha256 value="36de4474dadcac931e24f8ead7c6bdd39a4232e02205201c1991e215d45371e4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.objenesis" name="objenesis" version="2.5.1">
Expand Down
2 changes: 1 addition & 1 deletion server/dbconf/derby/derby-user.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
{call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('APP', 'PERSON', 0)}
</select>

<select id='selectPreferencesForUser' parameterType='java.lang.String' resultType='KeyValuePair'>
<select id='selectPreferencesForUser' parameterType='java.lang.Integer' resultType='KeyValuePair'>
SELECT NAME AS "key", VALUE AS "value"
FROM PERSON_PREFERENCE
WHERE PERSON_ID = #{value}
Expand Down
2 changes: 1 addition & 1 deletion server/dbconf/mysql/mysql-user.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
SET LOGGED_IN = FALSE
</update>

<select id='selectPreferencesForUser' parameterType='java.lang.String' resultType='KeyValuePair'>
<select id='selectPreferencesForUser' parameterType='java.lang.Integer' resultType='KeyValuePair'>
SELECT NAME AS "key", VALUE AS "value"
FROM PERSON_PREFERENCE
WHERE PERSON_ID = #{value}
Expand Down
2 changes: 1 addition & 1 deletion server/dbconf/oracle/oracle-user.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
SET LOGGED_IN = 0
</update>

<select id='selectPreferencesForUser' parameterType='java.lang.String' resultType='KeyValuePair'>
<select id='selectPreferencesForUser' parameterType='java.lang.Integer' resultType='KeyValuePair'>
SELECT NAME "key", VALUE "value"
FROM PERSON_PREFERENCE
WHERE PERSON_ID = #{value}
Expand Down
2 changes: 1 addition & 1 deletion server/dbconf/postgres/postgres-user.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
SET LOGGED_IN = FALSE
</update>

<select id='selectPreferencesForUser' parameterType='java.lang.String' resultType='KeyValuePair'>
<select id='selectPreferencesForUser' parameterType='java.lang.Integer' resultType='KeyValuePair'>
SELECT NAME AS "key", VALUE AS "value"
FROM PERSON_PREFERENCE
WHERE PERSON_ID = #{value}
Expand Down
2 changes: 1 addition & 1 deletion server/dbconf/sqlserver/sqlserver-user.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
SET LOGGED_IN = 0
</update>

<select id='selectPreferencesForUser' parameterType='java.lang.String' resultType='KeyValuePair'>
<select id='selectPreferencesForUser' parameterType='java.lang.Integer' resultType='KeyValuePair'>
SELECT NAME AS "key", VALUE AS "value"
FROM PERSON_PREFERENCE
WHERE PERSON_ID = #{value}
Expand Down
10 changes: 7 additions & 3 deletions server/docs/thirdparty/THIRD-PARTY-README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ The following are distributed under the terms of the Apache License version 2.0
Google Code Prettify (https://github.com/google/code-prettify)
Guava 32.0.1 [incl. CLI] (https://github.com/google/guava)
Guice 4.1 (https://github.com/google/guice)
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
Expand Down Expand Up @@ -81,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)


--------------------------------------------------------------------------------

Expand Down Expand Up @@ -717,7 +721,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 ===================

Expand Down
Loading