diff --git a/generators/cucumber/__snapshots__/generator.spec.ts.snap b/generators/cucumber/__snapshots__/generator.spec.ts.snap
index 87f5f57a3a14..795b2c725108 100644
--- a/generators/cucumber/__snapshots__/generator.spec.ts.snap
+++ b/generators/cucumber/__snapshots__/generator.spec.ts.snap
@@ -155,9 +155,8 @@ dependencies {
 tasks.register('consoleLauncherTest', JavaExec) {
     dependsOn(testClasses)
     String cucumberReportsDir = file("$buildDir/reports/tests")
-    outputs.dir(reportsDir)
     classpath = sourceSets["test"].runtimeClasspath
-    main = "org.junit.platform.console.ConsoleLauncher"
+    mainClass = "org.junit.platform.console.ConsoleLauncher"
     args("--scan-classpath")
     args("--include-engine", "cucumber")
     args("--reports-dir", cucumberReportsDir)
diff --git a/generators/cucumber/templates/buildSrc/src/main/groovy/jhipster.cucumber-conventions.gradle.ejs b/generators/cucumber/templates/buildSrc/src/main/groovy/jhipster.cucumber-conventions.gradle.ejs
index fe6aa07895e1..20967ffdded0 100644
--- a/generators/cucumber/templates/buildSrc/src/main/groovy/jhipster.cucumber-conventions.gradle.ejs
+++ b/generators/cucumber/templates/buildSrc/src/main/groovy/jhipster.cucumber-conventions.gradle.ejs
@@ -5,9 +5,8 @@ dependencies {
 tasks.register('consoleLauncherTest', JavaExec) {
     dependsOn(testClasses)
     String cucumberReportsDir = file("$buildDir/reports/tests")
-    outputs.dir(reportsDir)
     classpath = sourceSets["test"].runtimeClasspath
-    main = "org.junit.platform.console.ConsoleLauncher"
+    mainClass = "org.junit.platform.console.ConsoleLauncher"
     args("--scan-classpath")
     args("--include-engine", "cucumber")
     args("--reports-dir", cucumberReportsDir)
diff --git a/generators/gradle/templates/gradle/wrapper/gradle-wrapper.properties b/generators/gradle/templates/gradle/wrapper/gradle-wrapper.properties
index 3ae1e2f124c5..d30212c04be1 100644
--- a/generators/gradle/templates/gradle/wrapper/gradle-wrapper.properties
+++ b/generators/gradle/templates/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/generators/server/resources/gradle/libs.versions.toml b/generators/server/resources/gradle/libs.versions.toml
index 05208a5d941c..da0530c67a43 100644
--- a/generators/server/resources/gradle/libs.versions.toml
+++ b/generators/server/resources/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [libraries]
-spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2024.0.1' }
+spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2025.0.0' }
 
 springdoc = { module = 'org.springdoc:springdoc-openapi-starter-webmvc-api', version = '2.8.9' }
 
diff --git a/generators/spring-boot/templates/build.gradle.ejs b/generators/spring-boot/templates/build.gradle.ejs
index 497c41d72d80..8f27b59b50ff 100644
--- a/generators/spring-boot/templates/build.gradle.ejs
+++ b/generators/spring-boot/templates/build.gradle.ejs
@@ -30,8 +30,12 @@ version = "0.0.1-SNAPSHOT"
 
 description = ""
 
-sourceCompatibility=<%= javaVersion %>
-targetCompatibility=<%= javaVersion %>
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(<%= javaVersion %>)
+    }
+}
+
 assert System.properties["java.specification.version"] == <%- javaCompatibleVersions.map(ver => `"${ver}"`).join(' || '); %>
 
 ext {
@@ -117,7 +121,10 @@ test {
     // uncomment if the tests reports are not generated
     // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
     // ignoreFailures true
-    reports.html.required = false
+
+    reports {
+        html.required = false
+    }
     testLogging.exceptionFormat "full"
 <%_ if (reactive) { _%>
 
@@ -175,9 +182,7 @@ dependencies {
 <%_ } _%>
     implementation "jakarta.annotation:jakarta.annotation-api"
     implementation "org.apache.commons:commons-lang3"
-<%_ if (reactive) { _%>
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-<%_ } _%>
     annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
     implementation "org.mapstruct:mapstruct:${mapstructVersion}"
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
diff --git a/generators/spring-boot/templates/gradle/war.gradle.ejs b/generators/spring-boot/templates/gradle/war.gradle.ejs
index 49c915b03fd9..8f85a0820fbc 100644
--- a/generators/spring-boot/templates/gradle/war.gradle.ejs
+++ b/generators/spring-boot/templates/gradle/war.gradle.ejs
@@ -19,6 +19,7 @@
 apply plugin: "war"
 
 bootWar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     mainClass = "<%= packageName %>.<%= mainClass %>"
     includes = ["WEB-INF/**", "META-INF/**"]
 <%_ if (!skipClient) { _%>
@@ -28,7 +29,7 @@ bootWar {
 
 war {
 <%_ if (!skipClient) { _%>
-    webAppDirName = "<%= locals.clientDistDir %>"
+    from("<%= locals.clientDistDir %>")
     webXml = file("${project.rootDir}/<%= locals.clientSrcDir %>WEB-INF/web.xml")
 <%_ } _%>
     enabled = true