From 12eb6838c5b3661485507381c40e80b4361f9b68 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Tue, 27 May 2025 12:30:32 -0700 Subject: [PATCH 1/3] Update JAR Dependencies - May 2025 --- gradle.properties | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index f78f65d2f5..4a198a0de9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -99,7 +99,7 @@ apacheDirectoryVersion=2.1.7 apacheMinaVersion=2.2.4 # Usually matches the version specified as a Spring Boot dependency (see springBootVersion below) -apacheTomcatVersion=10.1.40 +apacheTomcatVersion=10.1.41 # (mothership) -> json-path -> json-smart -> accessor-smart # (core) -> graalvm @@ -107,11 +107,11 @@ apacheTomcatVersion=10.1.40 asmVersion=9.8 # Apache Batik -- Batik version needs to be compatible with Apache FOP, but we need to pull in batik-codec separately -batikVersion=1.18 +batikVersion=1.19 # sync with Tika version (or later) -bouncycastlePgpVersion=1.79 -bouncycastleVersion=1.79 +bouncycastlePgpVersion=1.80 +bouncycastleVersion=1.80 cglibNodepVersion=2.2.3 @@ -123,7 +123,7 @@ commonmarkVersion=0.24.0 # in the :server:api module but is required for some of our code to compile commonsBeanutilsVersion=1.10.1 commonsCodecVersion=1.18.0 -commonsCollections4Version=4.4 +commonsCollections4Version=4.5.0 commonsCollectionsVersion=3.2.2 commonsCompressVersion=1.27.1 commonsDbcpVersion=1.4 @@ -139,7 +139,7 @@ commonsTextVersion=1.13.1 commonsValidatorVersion=1.9.0 commonsVfs2Version=2.10.0 -datadogVersion=1.48.1 +datadogVersion=1.49.0 dom4jVersion=2.1.4 @@ -151,14 +151,14 @@ eigenbaseXomVersion=1.3.7 flyingsaucerVersion=R8 # Apache FOP -- linked to Apache Batik version above -fopVersion=2.10 +fopVersion=2.11 # Force latest for consistency googleAutoValueAnnotationsVersion=1.10.4 googleErrorProneAnnotationsVersion=2.38.0 -googleHttpClientVersion=1.46.3 +googleHttpClientVersion=1.47.0 googleOauthClientVersion=1.39.0 -googleProtocolBufVersion=3.25.6 +googleProtocolBufVersion=3.25.7 # Cloud and SequenceAnalysis bring gson in as a transitive dependency. # We resolve to the later version here to keep things consistent @@ -182,7 +182,7 @@ hamcrestVersion=2.2 # Note: if changing this, we might need to match with the picard version in the SequenceAnalysis module build.gradle htsjdkVersion=4.0.0 -httpclient5Version=5.4.3 +httpclient5Version=5.5 httpcore5Version=5.3.4 # Not used directly, but these are widely used transitive dependencies @@ -192,10 +192,10 @@ httpcoreVersion=4.4.16 intellijKotlinVersion=1.9.10 # Update all Jackson dependency versions below in tandem, unless one gets a patch release out-of-sync with the others -jacksonVersion=2.18.3 -jacksonAnnotationsVersion=2.18.3 -jacksonDatabindVersion=2.18.3 -jacksonJaxrsBaseVersion=2.18.3 +jacksonVersion=2.19.0 +jacksonAnnotationsVersion=2.19.0 +jacksonDatabindVersion=2.19.0 +jacksonJaxrsBaseVersion=2.19.0 # The Jakarta Activation API version that Angus Activation implements. Keep in sync with angusActivationVersion (above). jakartaActivationApiVersion=2.1.3 @@ -228,9 +228,9 @@ jodaTimeVersion=2.14.0 # brought in transitively by Cloud, FileTransfer, SequenceAnalysis, etc. Need to resolve consistently jsr305Version=3.0.2 -orgJsonVersion=20250107 +orgJsonVersion=20250517 -jsoupVersion=1.19.1 +jsoupVersion=1.20.1 junitVersion=4.13.2 @@ -247,7 +247,7 @@ luceneVersion=9.12.1 mssqlJdbcVersion=12.10.0.jre11 # force for docker -nettyVersion=4.2.0.Final +nettyVersion=4.2.1.Final objenesisVersion=1.0 @@ -286,7 +286,7 @@ slf4jLog4jApiVersion=2.0.16 snappyJavaVersion=1.1.10.7 # Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version -springBootVersion=3.4.5 +springBootVersion=3.5.0 # This usually matches the Spring Framework version dictated by springBootVersion springVersion=6.2.7 From 6945c86567e667303c55750ad2b27790981ca6c8 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 28 May 2025 08:49:12 -0700 Subject: [PATCH 2/3] No bouncycastle upgrade --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4a198a0de9..5389e4b33f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -110,8 +110,8 @@ asmVersion=9.8 batikVersion=1.19 # sync with Tika version (or later) -bouncycastlePgpVersion=1.80 -bouncycastleVersion=1.80 +bouncycastlePgpVersion=1.79 +bouncycastleVersion=1.79 cglibNodepVersion=2.2.3 From fd1513a35f8e2b033bb6926ef58de3a7cad066c0 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 28 May 2025 09:13:45 -0700 Subject: [PATCH 3/3] Force commonsCollections4Version --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 0cf1a99b57..b8366f5c16 100644 --- a/build.gradle +++ b/build.gradle @@ -206,6 +206,8 @@ allprojects { force "commons-pool:commons-pool:${commonsPoolVersion}" // force version for consistency with premium, OpenLdapSync force "org.apache.commons:commons-text:${commonsTextVersion}" + // force version for consistency with search, premium, api + force "org.apache.commons:commons-collections4:${commonsCollections4Version}" // force version for consistency with query, saml, LDK, api force "commons-collections:commons-collections:${commonsCollectionsVersion}" // force version for ms2, saml, fileTransfer, harvest, api, accounts, docker