Skip to content

Commit a031586

Browse files
committed
Merge 25.3 to 25.5
2 parents bb9de59 + 7ed7522 commit a031586

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ angusMailVersion=2.0.3
9292
annotationsVersion=15.0
9393

9494
antVersion=1.10.13
95-
95+
9696
#Unifying version used by DISCVR and Premium
9797
apacheDirectoryVersion=2.1.7
9898
#Transitive dependency of Apache directory: 2.0.18 contains some regressions
9999
apacheMinaVersion=2.2.4
100100

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

104104
# (mothership) -> json-path -> json-smart -> accessor-smart
105105
# (core) -> graalvm
@@ -158,7 +158,7 @@ googleAutoValueAnnotationsVersion=1.10.4
158158
googleErrorProneAnnotationsVersion=2.38.0
159159
googleHttpClientVersion=1.46.3
160160
googleOauthClientVersion=1.39.0
161-
googleProtocolBufVersion=3.25.5
161+
googleProtocolBufVersion=3.25.6
162162

163163
# Cloud and SequenceAnalysis bring gson in as a transitive dependency.
164164
# We resolve to the later version here to keep things consistent
@@ -286,9 +286,9 @@ slf4jLog4jApiVersion=2.0.16
286286
snappyJavaVersion=1.1.10.7
287287

288288
# Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
289-
springBootVersion=3.4.4
289+
springBootVersion=3.4.5
290290
# This usually matches the Spring Framework version dictated by springBootVersion
291-
springVersion=6.2.5
291+
springVersion=6.2.6
292292

293293
sqliteJdbcVersion=3.49.1.0
294294

0 commit comments

Comments
 (0)