Skip to content

Commit b621ac4

Browse files
Update various dependency versions (#1220)
1 parent 9f1e099 commit b621ac4

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ allprojects {
252252
force "org.eclipse.angus:angus-activation:${angusActivationVersion}"
253253
// force Jakarta Activation API version used by our Angus Activation implementation
254254
force "jakarta.activation:jakarta.activation-api:${jakartaActivationApiVersion}"
255+
// SequenceAnalysis brings in an older version via biojava-genome 7.1.1
256+
force "jakarta.xml.bind:jakarta.xml.bind-api:${jaxbApiVersion}"
255257
// force version for accounts, api, query
256258
force "javax.validation:validation-api:${validationApiVersion}"
257259
// force version for accounts, docker, api, workflow
@@ -299,7 +301,7 @@ allprojects {
299301
force "io.grpc:grpc-stub:${grpcVersion}"
300302
force "io.grpc:grpc-xds:${grpcVersion}"
301303

302-
// workflow (Activiti) brings in older versions of these libraries, so we need to force these versions
304+
// tcrdb, cloud, SequenceAnalysis, recipe mfa, pipeline, fileTransfer, docker mcc, DiscvrLabKeyModules:Studies and api have differnet versions of these libraries, so we need to force these versions
303305
force "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
304306
force "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
305307
// The version of picard we depend on brings in an older version of htsjdk, but SequenceAnalysis depends on a later version
@@ -557,6 +559,6 @@ project.tasks.register('ijConfigure') {
557559
project.tasks.register('purgeNpmAlphaVersions', PurgeNpmAlphaVersions) {
558560
group = GroupNames.NPM_RUN
559561
description = "Given an alpha version prefix for npm packages via the property -P${PurgeNpmAlphaVersions.ALPHA_PREFIX_PROPERTY}=yourPrefix, " +
560-
"removes all packages with versions that match that prefix from Artifactory (e.g., @labkey/components-1.2.3-yourPrefix.0 and @labkey/workflow-0.3.4-yourPrefix.1). " +
562+
"removes all packages with versions that match that prefix from Artifactory (e.g., @labkey/components-1.2.3-yourPrefix.0 and @labkey/premium-0.3.4-yourPrefix.1). " +
561563
" Use -PdryRun to see what versions would be deleted without actually doing the deletion."
562564
}

gradle.properties

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ windowsProteomicsBinariesVersion=1.0
6060
artifactoryPluginVersion=5.2.5
6161
gradleNodePluginVersion=7.1.0
6262
gradlePluginsVersion=7.1.0
63-
owaspDependencyCheckPluginVersion=12.1.8
63+
owaspDependencyCheckPluginVersion=12.1.9
6464
versioningPluginVersion=1.1.3
6565

6666
# Versions of node and npm to use during the build. If set, these versions
@@ -99,7 +99,7 @@ apacheDirectoryVersion=2.1.7
9999
apacheMinaVersion=2.2.4
100100

101101
# Usually matches the version specified as a Spring Boot dependency (see springBootVersion below)
102-
apacheTomcatVersion=10.1.48
102+
apacheTomcatVersion=10.1.49
103103

104104
# (mothership) -> json-path -> json-smart -> accessor-smart
105105
# (core) -> graalvm
@@ -122,24 +122,24 @@ commonmarkVersion=0.27.0
122122
# the beanutils version is not the default version brought from commons-validator and/or commons-digester
123123
# in the :server:api module but is required for some of our code to compile
124124
commonsBeanutilsVersion=1.11.0
125-
commonsCodecVersion=1.19.0
125+
commonsCodecVersion=1.20.0
126126
commonsCollections4Version=4.5.0
127127
commonsCollectionsVersion=3.2.2
128128
commonsCompressVersion=1.28.0
129129
commonsDbcpVersion=1.4
130130
commonsDigesterVersion=1.8.1
131131
commonsDiscoveryVersion=0.2
132-
commonsIoVersion=2.20.0
133-
commonsLang3Version=3.19.0
132+
commonsIoVersion=2.21.0
133+
commonsLang3Version=3.20.0
134134
commonsLangVersion=2.6
135135
commonsLoggingVersion=1.3.5
136136
commonsMath3Version=3.6.1
137137
commonsPoolVersion=1.6
138138
commonsTextVersion=1.14.0
139-
commonsValidatorVersion=1.10.0
139+
commonsValidatorVersion=1.10.1
140140
commonsVfs2Version=2.10.0
141141

142-
datadogVersion=1.54.0
142+
datadogVersion=1.55.0
143143

144144
dom4jVersion=2.1.4
145145

@@ -155,7 +155,7 @@ fopVersion=2.11
155155

156156
# Force latest for consistency
157157
googleAutoValueAnnotationsVersion=1.10.4
158-
googleErrorProneAnnotationsVersion=2.42.0
158+
googleErrorProneAnnotationsVersion=2.44.0
159159
googleHttpClientVersion=2.0.2
160160
googleOauthClientVersion=1.39.0
161161
googleProtocolBufVersion=3.25.8
@@ -166,7 +166,7 @@ googleProtocolBufVersion=3.25.8
166166
# "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.<init>(java.util.Map)'" errors
167167
gsonVersion=2.8.9
168168

169-
grpcVersion=1.76.0
169+
grpcVersion=1.77.0
170170

171171
guavaVersion=33.5.0-jre
172172

@@ -212,7 +212,7 @@ jaxbApiOldVersion=2.3.1
212212
jaxbOldVersion=2.3.3
213213

214214
# All other direct and indirect uses of JAXB use the current, jakarta-packaged versions
215-
jaxbApiVersion=4.0.2
215+
jaxbApiVersion=4.0.4
216216
jaxbVersion=4.0.5
217217

218218
jaxrpcVersion=1.1
@@ -267,7 +267,7 @@ pollingWatchVersion=0.2.0
267267
# Newer versions of the driver have a perf degradation that's important for us. https://github.com/pgjdbc/pgjdbc/issues/3505
268268
postgresqlDriverVersion=42.7.8
269269

270-
quartzVersion=2.5.0
270+
quartzVersion=2.5.1
271271

272272
reflectionsVersion=0.10.2
273273

@@ -290,9 +290,9 @@ snappyJavaVersion=1.1.10.8
290290
# Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
291291
springBootVersion=3.5.7
292292
# This usually matches the Spring Framework version dictated by springBootVersion
293-
springVersion=6.2.12
293+
springVersion=6.2.13
294294

295-
sqliteJdbcVersion=3.50.3.0
295+
sqliteJdbcVersion=3.51.0.0
296296

297297
# NLP and SAML bring stax2-api in as a transitive dependency but with very different versions. We force the later version.
298298
stax2ApiVersion=4.2.2

0 commit comments

Comments
 (0)