Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions generators/cucumber/__snapshots__/generator.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion generators/server/resources/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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' }

Expand Down
15 changes: 10 additions & 5 deletions generators/spring-boot/templates/build.gradle.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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) { _%>

Expand Down Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion generators/spring-boot/templates/gradle/war.gradle.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
apply plugin: "war"

bootWar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
mainClass = "<%= packageName %>.<%= mainClass %>"
includes = ["WEB-INF/**", "META-INF/**"]
<%_ if (!skipClient) { _%>
Expand All @@ -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
Expand Down
Loading