Skip to content

Update JAR Dependencies - May 2025 #1073

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

Merged
labkey-tchad merged 4 commits into from
May 28, 2025
Merged

Update JAR Dependencies - May 2025 #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12eb683
Update JAR Dependencies - May 2025
labkey-tchad May 27, 2025
4b79877
Merge remote-tracking branch 'origin/develop' into fb_jarUpdatesMay2025
labkey-tchad May 28, 2025
6945c86
No bouncycastle upgrade
labkey-tchad May 28, 2025
fd1513a
Force commonsCollections4Version
labkey-tchad May 28, 2025
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
2 changes: 2 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 16 additions & 16 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ 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
# tika
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
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down