1 files changed, 13 insertions, 11 deletions
diff --git a/build.gradle b/build.gradle
index d01156d940a..6b5dd906231 100644
--- a/build.gradle
+++ b/build.gradle
@@ -227,7 +227,7 @@ subprojects {
 
   ext {
     protobufVersion = '4.29.0'
-    springVersion = '5.3.39'
+    springVersion = '6.2.1'
     elasticSearchClientVersion = '7.17.25'
   }
 
@@ -335,8 +335,10 @@ subprojects {
         entry 'logback-classic'
         entry 'logback-core'
       }
-      // TODO switch to dependency 'ch.qos.logback.access:tomcat:2.0.1' when upgrading to Tomcat 10+
-      dependency 'ch.qos.logback:logback-access:1.3.14'
+
+      // https://mvnrepository.com/artifact/ch.qos.logback.access/common
+      dependency('ch.qos.logback.access:common:2.0.3')
+      dependency('ch.qos.logback.access:logback-access-tomcat:2.0.4')
       dependency('commons-beanutils:commons-beanutils:1.9.4') {
         exclude 'commons-logging:commons-logging'
       }
@@ -404,11 +406,11 @@ subprojects {
       }
       dependency 'com.auth0:java-jwt:4.4.0'
       dependency 'io.netty:netty-all:4.1.115.Final'
-      dependency 'com.sun.mail:jakarta.mail:1.6.7'
+      dependency 'jakarta.mail:jakarta.mail-api:2.1.3'
       dependency 'javax.annotation:javax.annotation-api:1.3.2'
       dependency 'javax.inject:javax.inject:1'
       dependency 'javax.xml.bind:jaxb-api:2.3.1'
-      dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4'
+      dependency 'jakarta.servlet:jakarta.servlet-api:6.0.0'
       dependency 'junit:junit:4.13.2'
       dependency 'org.xmlunit:xmlunit-core:2.10.0'
       dependency 'org.xmlunit:xmlunit-matchers:2.10.0'
@@ -419,7 +421,7 @@ subprojects {
       dependency 'org.apache.commons:commons-collections4:4.4'
       dependency 'org.apache.commons:commons-csv:1.12.0'
       dependency 'org.apache.commons:commons-lang3:3.17.0'
-      dependency 'org.apache.commons:commons-email:1.6.0'
+      dependency 'org.apache.commons:commons-email2-jakarta:2.0.0-M1'
       dependency 'org.apache.commons:commons-text:1.12.0'
       dependency 'org.apache.mina:mina-core:2.2.3'
       dependency 'org.apache.kerby:kerb-simplekdc:2.1.0'
@@ -434,7 +436,7 @@ subprojects {
         entry 'log4j-api'
         entry 'log4j-to-slf4j'
       }
-      dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.90') {
+      dependencySet(group: 'org.apache.tomcat.embed', version: '10.1.34') {
         entry 'tomcat-embed-core'
         entry('tomcat-embed-jasper') {
           exclude 'org.eclipse.jdt.core.compiler:ecj'
@@ -515,12 +517,12 @@ subprojects {
       dependency("org.springframework:spring-webmvc:${springVersion}") {
         exclude 'commons-logging:commons-logging'
       }
-      dependency 'org.springdoc:springdoc-openapi-webmvc-core:1.8.0'
+      dependency 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.7.0'
       dependency 'org.subethamail:subethasmtp:3.1.7'
       dependency 'org.yaml:snakeyaml:2.3'
-      dependency 'org.hibernate.validator:hibernate-validator:6.2.5.Final'
-      dependency 'jakarta.el:jakarta.el-api:3.0.3'
-      dependency 'org.glassfish:jakarta.el:3.0.4'
+      dependency 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
+      dependency 'jakarta.el:jakarta.el-api:5.0.1'
+      dependency 'org.glassfish.expressly:expressly:5.0.0'
       dependency 'org.kohsuke:github-api:1.326'
       dependency 'org.wiremock:wiremock-standalone:3.10.0'
       dependency 'org.skyscreamer:jsonassert:1.5.3'