Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ plugins {
id "com.jfrog.artifactory" version "${artifactoryPluginVersion}" apply false
id "com.github.node-gradle.node" version "${gradleNodePluginVersion}" apply false
id "org.owasp.dependencycheck" version "${owaspDependencyCheckPluginVersion}" apply false
id "com.github.ben-manes.versions" version "0.54.0"
id "io.github.ben-manes.versions" version "0.61.0"
id "org.labkey.build.multiGit"
}

Expand Down
36 changes: 18 additions & 18 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ osxProteomicsBinariesVersion=1.0
windowsProteomicsBinariesVersion=1.0

# The current version numbers for the gradle plugins.
artifactoryPluginVersion=5.2.5
artifactoryPluginVersion=6.0.4
gradleNodePluginVersion=7.1.0
gradlePluginsVersion=10.0.1
owaspDependencyCheckPluginVersion=13.0.0
Expand Down Expand Up @@ -121,13 +121,13 @@ cglibNodepVersion=2.2.3

checkerQualVersion=3.53.0

commonmarkVersion=0.29.0
commonmarkVersion=0.30.0

# the beanutils version is not the default version brought from commons-validator and/or commons-digester
# in the :server:api module but is required for some of our code to compile
commonsBeanutilsVersion=1.11.0
commonsCodecVersion=1.22.1
commonsCollections4Version=4.5.0
commonsCollections4Version=4.6.0
commonsCollectionsVersion=3.2.2
commonsCompressVersion=1.28.0
commonsDbcpVersion=1.4
Expand All @@ -143,11 +143,11 @@ commonsTextVersion=1.15.0
commonsValidatorVersion=1.11.0
commonsVfs2Version=2.10.0

datadogVersion=1.65.0
datadogVersion=1.65.1

dom4jVersion=2.2.0

ehcacheCoreVersion=2.6.8
ehcacheCoreVersion=2.6.11
eigenbasePropertiesVersion=1.1.6
eigenbaseResgenVersion=1.3.7
eigenbaseXomVersion=1.3.7
Expand All @@ -166,7 +166,7 @@ googleHttpClientVersion=2.2.0
googleOauthClientVersion=1.39.0
googleProtocolBufVersion=3.25.9

graphSupportVersion=1.5.2
graphSupportVersion=1.5.3
grpcVersion=1.83.1

# Cloud and SequenceAnalysis bring gson in as a transitive dependency.
Expand Down Expand Up @@ -195,15 +195,15 @@ httpcoreVersion=4.4.16
intellijKotlinVersion=2.3.10

# Update the three Jackson dependency versions below in tandem, unless one gets a patch release out-of-sync with the others
jacksonVersion=2.21.5
jacksonDatabindVersion=2.21.5
jacksonJaxrsBaseVersion=2.21.5
jacksonVersion=2.21.6
jacksonDatabindVersion=2.21.6
jacksonJaxrsBaseVersion=2.21.6

# Note the inconsistent version numbering for "annotations"... it no longer matches the above
jacksonAnnotationsVersion=2.21

# Spring Boot brings in a transitive dependency on Jackson 3.x. It has changed package names and can coexist with Jackson 2.x.
jackson3Version=3.1.5
jackson3Version=3.1.6

# The Jakarta Activation API version that Angus Activation implements. Keep in sync with angusActivationVersion (above).
jakartaActivationApiVersion=2.1.4
Expand Down Expand Up @@ -243,9 +243,9 @@ jodaTimeVersion=2.14.3
# brought in transitively by Cloud, FileTransfer, SequenceAnalysis, etc. Need to resolve consistently
jsr305Version=3.0.2

orgJsonVersion=20260719
orgJsonVersion=20260814

jsoupVersion=1.23.1
jsoupVersion=1.23.2

junitVersion=4.13.2

Expand All @@ -255,12 +255,12 @@ kaptchaVersion=2.3

log4j2Version=2.26.1

lombokVersion=1.18.46
lombokVersion=1.18.48

luceneVersion=10.5.0
luceneVersion=10.5.1

# Microsoft library for sending OAuth2-authenticated notification emails via the Microsoft Graph API
microsoftGraphVersion=6.67.0
microsoftGraphVersion=6.69.0

mssqlJdbcVersion=13.4.0.jre11

Expand Down Expand Up @@ -306,12 +306,12 @@ slf4jLog4jApiVersion=2.0.18
snappyJavaVersion=1.1.10.8

# Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
springBootVersion=4.1.0
springBootVersion=4.1.1
# This usually matches the Spring Framework version dictated by springBootVersion
springVersion=7.0.9
springAiVersion=2.0.1

sqliteJdbcVersion=3.53.2.1
sqliteJdbcVersion=3.53.4.0

# SAML brings stax2-api in as a transitive dependency. We force the latest version.
stax2ApiVersion=4.2.2
Expand All @@ -337,4 +337,4 @@ xercesImplVersion=2.12.2
xmlApisVersion=1.0.b2

# sync with Tika/POI
xmlbeansVersion=5.2.0
xmlbeansVersion=5.4.0

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some

2 changes: 1 addition & 1 deletion server/embedded/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
id "java"
id "maven-publish"
id "org.springframework.boot" version "${springBootVersion}"
id "io.spring.dependency-management" version "1.0.8.RELEASE"
id "io.spring.dependency-management" version "1.1.7"
}

// 'dependency-management' plugin doesn't allow us to use 'resolutionStrategy.force' to lock versions
Expand Down