diff --git a/build.gradle b/build.gradle index 00f7bbb49d39..4091d7584bc7 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { id "idea" id "jacoco" id "org.springframework.boot" version "${spring_boot_version}" - id "io.spring.dependency-management" version "1.1.6" + id "io.spring.dependency-management" version "1.1.7" id "com.google.cloud.tools.jib" version "3.4.4" id "com.github.node-gradle.node" version "${gradle_node_plugin_version}" id "com.diffplug.spotless" version "6.25.0" @@ -384,6 +384,13 @@ dependencies { exclude module: "spring-boot-starter-undertow" } implementation "org.springframework.boot:spring-boot-starter-tomcat:${spring_boot_version}" + + // Avoid security issues in Tomcat 10.1.33 + implementation "org.apache.tomcat.embed:tomcat-embed-core:${tomcat_version}" + implementation "org.apache.tomcat.embed:tomcat-embed-el:${tomcat_version}" + implementation "org.apache.tomcat.embed:tomcat-embed-websocket:${tomcat_version}" + implementation "org.apache.tomcat:tomcat-annotations-api:${tomcat_version}" + implementation "org.springframework.boot:spring-boot-starter-websocket:${spring_boot_version}" implementation "org.springframework.boot:spring-boot-starter-thymeleaf:${spring_boot_version}" implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server:${spring_boot_version}" @@ -400,7 +407,7 @@ dependencies { implementation "org.springframework.cloud:spring-cloud-starter-config:${spring_cloud_version}" implementation "org.springframework.cloud:spring-cloud-commons:${spring_cloud_version}" - implementation "io.netty:netty-all:4.1.115.Final" + implementation "io.netty:netty-all:4.1.116.Final" implementation "io.projectreactor.netty:reactor-netty:1.2.1" implementation "org.springframework:spring-messaging:${spring_framework_version}" implementation "org.springframework.retry:spring-retry:2.0.11" @@ -451,7 +458,7 @@ dependencies { implementation "org.apfloat:apfloat:1.14.0" // use newest version of guava to avoid security issues through outdated dependencies - implementation "com.google.guava:guava:33.3.1-jre" + implementation "com.google.guava:guava:33.4.0-jre" implementation "com.sun.activation:jakarta.activation:2.0.1" // use newest version of gson to avoid security issues through outdated dependencies @@ -607,7 +614,7 @@ tasks.withType(Test).configureEach { } wrapper { - gradleVersion = "8.12-rc-1" + gradleVersion = "8.12-rc-2" } tasks.register("stage") { diff --git a/gradle.properties b/gradle.properties index de944d16001d..c110eb971ddc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ jhipster_dependencies_version=8.7.2 spring_boot_version=3.4.0 spring_framework_version=6.2.1 spring_cloud_version=4.2.0 -spring_security_version=6.4.1 +spring_security_version=6.4.2 # TODO: upgrading to 6.6.x currently leads to issues due to internal changes in Hibernate and potentially wrong use in Artemis server code hibernate_version=6.4.10.Final # TODO: can we update to 5.x? @@ -19,7 +19,8 @@ jwt_version=0.12.6 jaxb_runtime_version=4.0.5 hazelcast_version=5.5.0 fasterxml_version=2.18.2 -jgit_version=7.1.0.202411261347-r +# TODO: 7.1.0 includes bugs related to git diffs, therefore we cannot update +jgit_version=7.0.0.202409031743-r sshd_version=2.14.0 checkstyle_version=10.21.0 jplag_version=5.1.0 @@ -32,13 +33,14 @@ liquibase_version=4.30.0 docker_java_version=3.4.1 logback_version=1.5.12 java_parser_version=3.26.2 -byte_buddy_version=1.15.10 +byte_buddy_version=1.15.11 netty_version=4.1.115.Final +tomcat_version=10.1.34 # testing # make sure both versions are compatible junit_version=5.11.3 -junit_platform_version=1.11.3 +junit_platform_version=1.11.4 mockito_version=5.14.2 testcontainer_version=1.20.4 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9e40988550fd..fb4b1a2e2ced 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-rc-2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME