Merge 24.3 to 24.7

Conflicts: gradle.properties
LabKey · Jul 12, 2024 · f37c944 · f37c944
2 parents d0999f5 + 2008c6b
commit f37c944
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -103,7 +103,7 @@ apacheDirectoryVersion=2.1.3
 apacheMinaVersion=2.2.1
 
 # Keep in sync with springBootTomcatVersion below
-apacheTomcatVersion=10.1.24
+apacheTomcatVersion=10.1.25
 
 # (mothership) -> json-path -> json-smart -> accessor-smart
 # (core) -> graalvm
@@ -289,9 +289,9 @@ snappyJavaVersion=1.1.10.5
 springBootVersion=3.3.0
 # This usually matches the Tomcat version dictated by springBootVersion
 # Also, keep this in sync with apacheTomcatVersion above
-springBootTomcatVersion=10.1.24
+springBootTomcatVersion=10.1.25
 # This usually matches the Spring Framework version dictated by springBootVersion
-springVersion=6.1.8
+springVersion=6.1.10
 
 sqliteJdbcVersion=3.46.0.0