root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.3.x'

This commit is contained in:
Phillip Webb 2024-10-01 17:20:14 -07:00
parent 7de0b21089 9f34899454
commit e529769b0c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle
View File

@ -25,9 +25,9 @@ dependencies {
implementation("org.springframework:spring-core")
}
task copyIntegrationTestSources(type: Copy) {
task syncIntegrationTestSources(type: Sync) {
destinationDir file("${buildDir}/it")
from file("src/it")
into "${buildDir}/it"
filter(springRepoistoryTransformers.ant())
}
@ -39,7 +39,7 @@ processResources {
}
task integrationTest {
dependsOn copyIntegrationTestSources, jar
dependsOn syncIntegrationTestSources, jar
def resultsDir = file("${buildDir}/test-results/integrationTest")
inputs.dir(file("src/it")).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("source")
inputs.files(sourceSets.main.runtimeClasspath).withNormalizer(ClasspathNormalizer).withPropertyName("classpath")

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle
View File

@ -46,16 +46,16 @@ task syncTestRepository(type: Sync) {
}
}
task copyAntSources(type: Copy) {
task syncAntSources(type: Sync) {
destinationDir file("${buildDir}/ant")
from project.layout.projectDirectory
include "*.xml"
into "${buildDir}/ant"
filter(springRepoistoryTransformers.ant())
}
task antRun(type: JavaExec) {
workingDir "${buildDir}/ant"
dependsOn syncTestRepository, copyAntSources, configurations.antDependencies
dependsOn syncTestRepository, syncAntSources, configurations.antDependencies
classpath = configurations.antDependencies;
mainClass = "org.apache.tools.ant.launch.Launcher"
args = [ "clean", "build" ]