mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '2.5.x'
Closes gh-28754
This commit is contained in:
commit
0074d621d0
@ -214,7 +214,7 @@ tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
|
||||
attributes "spring-integration-docs": integrationDocs
|
||||
}
|
||||
dependsOn test
|
||||
inputs.dir("${buildDir}/generated-snippets").withPathSensitivity(PathSensitivity.RELATIVE)
|
||||
inputs.dir("${buildDir}/generated-snippets").withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("generatedSnippets")
|
||||
}
|
||||
|
||||
asciidoctor {
|
||||
|
@ -41,8 +41,8 @@ processResources {
|
||||
task integrationTest {
|
||||
dependsOn copyIntegrationTestSources, jar
|
||||
def resultsDir = file("${buildDir}/test-results/integrationTest")
|
||||
inputs.dir(file("src/it")).withPathSensitivity(PathSensitivity.RELATIVE)
|
||||
inputs.files(sourceSets.main.runtimeClasspath).withNormalizer(ClasspathNormalizer)
|
||||
inputs.dir(file("src/it")).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("source")
|
||||
inputs.files(sourceSets.main.runtimeClasspath).withNormalizer(ClasspathNormalizer).withPropertyName("classpath")
|
||||
outputs.dirs resultsDir
|
||||
doLast {
|
||||
ant.with {
|
||||
|
@ -64,7 +64,7 @@ task dependencyVersions(type: org.springframework.boot.build.constraints.Extract
|
||||
|
||||
tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
|
||||
dependsOn dependencyVersions
|
||||
inputs.dir('src/docs/gradle').withPathSensitivity(PathSensitivity.RELATIVE)
|
||||
inputs.dir('src/docs/gradle').withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName('buildScripts')
|
||||
doFirst {
|
||||
attributes "dependency-management-plugin-version": dependencyVersions.versionConstraints["io.spring.gradle:dependency-management-plugin"]
|
||||
}
|
||||
|
@ -37,7 +37,7 @@ dependencies {
|
||||
}
|
||||
|
||||
systemTest {
|
||||
inputs.files(war).withNormalizer(ClasspathNormalizer)
|
||||
inputs.files(war).withNormalizer(ClasspathNormalizer).withPropertyName("war")
|
||||
}
|
||||
|
||||
war {
|
||||
|
Loading…
Reference in New Issue
Block a user