Merge branch '3.3.x'
Closes gh-42774
This commit is contained in:
@@ -26,7 +26,7 @@ dependencies {
|
||||
}
|
||||
|
||||
task syncIntegrationTestSources(type: Sync) {
|
||||
destinationDir file("${buildDir}/it")
|
||||
destinationDir file(layout.buildDirectory.dir("it"))
|
||||
from file("src/it")
|
||||
filter(springRepositoryTransformers.ant())
|
||||
}
|
||||
@@ -40,7 +40,7 @@ processResources {
|
||||
|
||||
task integrationTest {
|
||||
dependsOn syncIntegrationTestSources, jar
|
||||
def resultsDir = file("${buildDir}/test-results/integrationTest")
|
||||
def resultsDir = file(layout.buildDirectory.dir("test-results/integrationTest"))
|
||||
inputs.dir(file("src/it")).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("source")
|
||||
inputs.files(sourceSets.main.runtimeClasspath).withNormalizer(ClasspathNormalizer).withPropertyName("classpath")
|
||||
outputs.dirs resultsDir
|
||||
@@ -62,9 +62,9 @@ task integrationTest {
|
||||
ant.propertyref(name: "ivy.class.path")
|
||||
}
|
||||
plainlistener()
|
||||
file("${buildDir}/test-results/integrationTest").mkdirs()
|
||||
file(layout.buildDirectory.dir("test-results/integrationTest")).mkdirs()
|
||||
xmllistener(toDir: resultsDir)
|
||||
fileset(dir: "${buildDir}/it", includes: "**/build.xml")
|
||||
fileset(dir: layout.buildDirectory.dir("it").get().asFile.toString(), includes: "**/build.xml")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user