Skip to content

Commit 95f6d44

Browse files
Minor version updates for 25.1 (#959)
1 parent 19c1813 commit 95f6d44

2 files changed

Lines changed: 26 additions & 18 deletions

File tree

dependencyCheckSuppression.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,5 +355,13 @@
355355
</suppress>
356356
<!-- end of glassfish false positive suppressions -->
357357

358+
<!-- We don't use the sun.io.useCanonCaches setting referenced by this CVE. -->
359+
<suppress>
360+
<notes><![CDATA[
361+
file name: tomcat-catalina-10.1.34.jar
362+
]]></notes>
363+
<packageUrl regex="true">^pkg:maven/org\.apache\.tomcat/tomcat-catalina@.*$</packageUrl>
364+
<vulnerabilityName>CVE-2024-56337</vulnerabilityName>
365+
</suppress>
358366
</suppressions>
359367

gradle.properties

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ annotationsVersion=15.0
9494
antVersion=1.10.13
9595

9696
#Unifying version used by DISCVR and Premium
97-
apacheDirectoryVersion=2.1.3
97+
apacheDirectoryVersion=2.1.7
9898
#Transitive dependency of Apache directory: 2.0.18 contains some regressions
99-
apacheMinaVersion=2.2.1
99+
apacheMinaVersion=2.2.4
100100

101101
# Usually matches the version specified as a Spring Boot dependency (see springBootVersion below)
102102
apacheTomcatVersion=10.1.34
@@ -133,11 +133,11 @@ commonsLang3Version=3.17.0
133133
commonsLoggingVersion=1.3.4
134134
commonsMath3Version=3.6.1
135135
commonsPoolVersion=1.6
136-
commonsTextVersion=1.12.0
136+
commonsTextVersion=1.13.0
137137
commonsValidatorVersion=1.9.0
138138
commonsVfs2Version=2.7.0
139139

140-
datadogVersion=1.42.2
140+
datadogVersion=1.44.1
141141

142142
dom4jVersion=2.1.4
143143

@@ -154,8 +154,8 @@ fopVersion=2.10
154154
# Force latest for consistency
155155
googleAutoValueAnnotationsVersion=1.10.4
156156
googleErrorProneAnnotationsVersion=2.36.0
157-
googleHttpClientVersion=1.45.1
158-
googleOauthClientVersion=1.36.0
157+
googleHttpClientVersion=1.45.3
158+
googleOauthClientVersion=1.37.0
159159
googleProtocolBufVersion=3.25.5
160160

161161
graalVersion=24.1.1
@@ -166,7 +166,7 @@ graalVersion=24.1.1
166166
# "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.<init>(java.util.Map)'" errors
167167
gsonVersion=2.8.9
168168

169-
grpcVersion=1.68.1
169+
grpcVersion=1.69.0
170170

171171
guavaVersion=33.3.1-jre
172172

@@ -190,10 +190,10 @@ httpclientVersion=4.5.14
190190
httpcoreVersion=4.4.16
191191

192192
# Update all Jackson dependency versions below in tandem, unless one gets a patch release out-of-sync with the others
193-
jacksonVersion=2.18.1
194-
jacksonAnnotationsVersion=2.18.1
195-
jacksonDatabindVersion=2.18.1
196-
jacksonJaxrsBaseVersion=2.18.1
193+
jacksonVersion=2.18.2
194+
jacksonAnnotationsVersion=2.18.2
195+
jacksonDatabindVersion=2.18.2
196+
jacksonJaxrsBaseVersion=2.18.2
197197

198198
# The Jakarta Activation API version that Angus Activation implements. Keep in sync with angusActivationVersion (above).
199199
jakartaActivationApiVersion=2.1.3
@@ -228,24 +228,24 @@ jsr305Version=3.0.2
228228

229229
orgJsonVersion=20240303
230230

231-
jsoupVersion=1.18.1
231+
jsoupVersion=1.18.3
232232

233233
junitVersion=4.13.2
234234

235235
jxlVersion=2.6.3
236236

237237
kaptchaVersion=2.3
238238

239-
log4j2Version=2.24.2
239+
log4j2Version=2.24.3
240240

241241
lombokVersion=1.18.36
242242

243-
luceneVersion=9.12.0
243+
luceneVersion=9.12.1
244244

245245
mssqlJdbcVersion=12.8.1.jre11
246246

247247
# forced compatibility between docker and UserReg-WS
248-
nettyVersion=4.1.115.Final
248+
nettyVersion=4.1.116.Final
249249

250250
objenesisVersion=1.0
251251

@@ -285,11 +285,11 @@ slf4jLog4jApiVersion=2.0.16
285285
snappyJavaVersion=1.1.10.7
286286

287287
# Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
288-
springBootVersion=3.4.0
288+
springBootVersion=3.4.1
289289
# This usually matches the Spring Framework version dictated by springBootVersion
290-
springVersion=6.2.0
290+
springVersion=6.2.1
291291

292-
sqliteJdbcVersion=3.47.0.0
292+
sqliteJdbcVersion=3.47.1.0
293293

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

0 commit comments

Comments
 (0)