From ce106eb43c86f1e9122ec506cff136b6115cf642 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Thu, 17 Oct 2024 17:41:00 +0200 Subject: [PATCH] Remove calls to deprecated Project.getBuildDir() in Gradle files Closes gh-42739 --- .../DocumentAutoConfigurationClasses.java | 4 +-- .../build.gradle | 4 +-- .../spring-boot-devtools/build.gradle | 2 +- .../spring-boot-docs/build.gradle | 26 +++++++++---------- .../build.gradle | 2 +- .../spring-boot-antlib/build.gradle | 8 +++--- .../spring-boot-cli/build.gradle | 4 +-- .../spring-boot-loader-tools/build.gradle | 8 +++--- .../spring-boot-maven-plugin/build.gradle | 10 +++---- spring-boot-project/spring-boot/build.gradle | 2 +- .../spring-boot-image-tests/build.gradle | 2 +- .../build.gradle | 8 +++--- .../build.gradle | 6 ++--- .../spring-boot-loader-tests/build.gradle | 12 ++++----- .../spring-boot-server-tests/build.gradle | 23 ++++++++-------- .../spring-boot-smoke-test-ant/build.gradle | 6 ++--- 16 files changed, 64 insertions(+), 63 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/DocumentAutoConfigurationClasses.java b/buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/DocumentAutoConfigurationClasses.java index 8881cf7b3b..0ed0672293 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/DocumentAutoConfigurationClasses.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/DocumentAutoConfigurationClasses.java @@ -30,8 +30,8 @@ import java.util.stream.Collectors; import org.gradle.api.DefaultTask; import org.gradle.api.Task; +import org.gradle.api.file.DirectoryProperty; import org.gradle.api.file.FileCollection; -import org.gradle.api.file.RegularFileProperty; import org.gradle.api.tasks.InputFiles; import org.gradle.api.tasks.OutputDirectory; import org.gradle.api.tasks.TaskAction; @@ -57,7 +57,7 @@ public abstract class DocumentAutoConfigurationClasses extends DefaultTask { } @OutputDirectory - public abstract RegularFileProperty getOutputDir(); + public abstract DirectoryProperty getOutputDir(); @TaskAction void documentAutoConfigurationClasses() throws IOException { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle index 3fcba9d2cf..680406dddf 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle @@ -240,7 +240,7 @@ def documentationTest = tasks.register("documentationTest", Test) { includeTestsMatching("org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.*") } jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED" - outputs.dir("${buildDir}/generated-snippets") + outputs.dir(layout.buildDirectory.dir("generated-snippets")) develocity { predictiveTestSelection { enabled = false @@ -261,5 +261,5 @@ tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) { attributes "spring-integration-docs": integrationDocs } dependsOn documentationTest - inputs.dir("${buildDir}/generated-snippets").withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("generatedSnippets") + inputs.dir(layout.buildDirectory.dir("generated-snippets")).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("generatedSnippets") } diff --git a/spring-boot-project/spring-boot-devtools/build.gradle b/spring-boot-project/spring-boot-devtools/build.gradle index d736bf5a91..eb4fe1b637 100644 --- a/spring-boot-project/spring-boot-devtools/build.gradle +++ b/spring-boot-project/spring-boot-devtools/build.gradle @@ -84,7 +84,7 @@ dependencies { } task syncIntTestDependencies(type: Sync) { - destinationDir = file("${buildDir}/dependencies") + destinationDir = file(layout.buildDirectory.dir("dependencies")) from { configurations.intTestDependencies } diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 3e6d10614f..09f8ef185d 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -220,7 +220,7 @@ task aggregatedJavadoc(type: Javadoc) { dependsOn publishedProjects.javadoc source publishedProjects.javadoc.source classpath = project.files(publishedProjects.javadoc.classpath) - destinationDir = project.file "${buildDir}/docs/javadoc" + destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc")) options { author = true docTitle = "Spring Boot ${project.version} API" @@ -253,33 +253,33 @@ task aggregatedJavadoc(type: Javadoc) { task documentTestSlices(type: org.springframework.boot.build.test.autoconfigure.DocumentTestSlices) { testSlices = configurations.testSlices - outputFile = file("${buildDir}/docs/generated/test-auto-configuration/documented-slices.adoc") + outputFile = layout.buildDirectory.file("docs/generated/test-auto-configuration/documented-slices.adoc") } task documentStarters(type: org.springframework.boot.build.starters.DocumentStarters) { - outputDir = file("${buildDir}/docs/generated/using/starters/") + outputDir = layout.buildDirectory.dir("docs/generated/using/starters/") } task documentAutoConfigurationClasses(type: org.springframework.boot.build.autoconfigure.DocumentAutoConfigurationClasses) { autoConfiguration = configurations.autoConfiguration - outputDir = file("${buildDir}/docs/generated/auto-configuration-classes/documented-auto-configuration-classes/") + outputDir = layout.buildDirectory.dir("docs/generated/auto-configuration-classes/documented-auto-configuration-classes/") } task documentDependencyVersions(type: org.springframework.boot.build.constraints.DocumentConstrainedVersions) { dependsOn dependencyVersions constrainedVersions.set(providers.provider { dependencyVersions.constrainedVersions }) - outputFile = file("${buildDir}/docs/generated/dependency-versions/documented-coordinates.adoc") + outputFile = layout.buildDirectory.file("docs/generated/dependency-versions/documented-coordinates.adoc") } task documentVersionProperties(type: org.springframework.boot.build.constraints.DocumentVersionProperties) { dependsOn dependencyVersions versionProperties.set(providers.provider { dependencyVersions.versionProperties}) - outputFile = file("${buildDir}/docs/generated/dependency-versions/documented-properties.adoc") + outputFile = layout.buildDirectory.file("docs/generated/dependency-versions/documented-properties.adoc") } task documentConfigurationProperties(type: org.springframework.boot.build.context.properties.DocumentConfigurationProperties) { configurationPropertyMetadata = configurations.configurationProperties - outputDir = file("${buildDir}/docs/generated/") + outputDir = layout.buildDirectory.dir("docs/generated/") } task documentDevtoolsPropertyDefaults(type: org.springframework.boot.build.devtools.DocumentDevtoolsPropertyDefaults) {} @@ -288,7 +288,7 @@ task runRemoteSpringApplicationExample(type: org.springframework.boot.build.docs classpath = configurations.remoteSpringApplicationExample mainClass = "org.springframework.boot.devtools.RemoteSpringApplication" args = ["https://myapp.example.com", "--spring.devtools.remote.secret=secret", "--spring.devtools.livereload.port=0"] - output = file("$buildDir/example-output/remote-spring-application.txt") + output = layout.buildDirectory.file("example-output/remote-spring-application.txt") expectedLogging = "Started RemoteSpringApplication in " applicationJar = "/Users/myuser/.m2/repository/org/springframework/boot/spring-boot-devtools/${project.version}/spring-boot-devtools-${project.version}.jar" normalizeLiveReloadPort() @@ -298,7 +298,7 @@ task runSpringApplicationExample(type: org.springframework.boot.build.docs.Appli classpath = configurations.springApplicationExample + sourceSets.main.output mainClass = "org.springframework.boot.docs.features.logexample.MyApplication" args = ["--server.port=0"] - output = file("$buildDir/example-output/spring-application.txt") + output = layout.buildDirectory.file("example-output/spring-application.txt") expectedLogging = "Started MyApplication in " normalizeTomcatPort() } @@ -307,7 +307,7 @@ task runLoggingFormatExample(type: org.springframework.boot.build.docs.Applicati classpath = configurations.springApplicationExample + sourceSets.main.output mainClass = "org.springframework.boot.docs.features.logexample.MyApplication" args = ["--spring.main.banner-mode=off", "--server.port=0", "--spring.application.name=myapp"] - output = file("$buildDir/example-output/logging-format.txt") + output = layout.buildDirectory.file("example-output/logging-format.txt") expectedLogging = "Started MyApplication in " normalizeTomcatPort() } @@ -398,7 +398,7 @@ syncDocumentationSourceForAsciidoctor { dependsOn documentVersionProperties dependsOn documentConfigurationProperties dependsOn documentDevtoolsPropertyDefaults - from("${buildDir}/docs/generated") { + from(layout.buildDirectory.dir("docs/generated")) { into "asciidoc" } from("src/main/java") { @@ -426,7 +426,7 @@ syncDocumentationSourceForAsciidoctorMultipage { dependsOn documentVersionProperties dependsOn documentConfigurationProperties dependsOn documentDevtoolsPropertyDefaults - from("${buildDir}/docs/generated") { + from(layout.buildDirectory.dir("docs/generated")) { into "asciidoc" } from("src/main/java") { @@ -454,7 +454,7 @@ syncDocumentationSourceForAsciidoctorPdf { dependsOn documentVersionProperties dependsOn documentConfigurationProperties dependsOn documentDevtoolsPropertyDefaults - from("${buildDir}/docs/generated") { + from(layout.buildDirectory.dir("docs/generated")) { into "asciidoc" } from("src/main/java") { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index a8e29132f7..0a55d6a26a 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -130,5 +130,5 @@ test { task testSliceMetadata(type: org.springframework.boot.build.test.autoconfigure.TestSliceMetadata) { sourceSet = sourceSets.main - outputFile = file("${buildDir}/test-slice-metadata.properties") + outputFile = layout.buildDirectory.file("test-slice-metadata.properties") } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle index f59b35f355..61dde9509f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle @@ -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") } } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle index 8df216c43d..312efac143 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle @@ -106,12 +106,12 @@ task tar(type: Tar) { task homebrewFormula(type: org.springframework.boot.build.cli.HomebrewFormula) { dependsOn tar - outputDir = file("${buildDir}/homebrew") + outputDir = layout.buildDirectory.dir("homebrew") template = file("src/main/homebrew/spring-boot.rb") archive = tar.archiveFile } -def homebrewFormulaArtifact = artifacts.add("archives", file("${buildDir}/homebrew/spring-boot.rb")) { +def homebrewFormulaArtifact = artifacts.add("archives", file(layout.buildDirectory.file("homebrew/spring-boot.rb"))) { type "rb" classifier "homebrew" builtBy "homebrewFormula" diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle index 6995c523dc..d61acca569 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Spring Boot Loader Tools" -def generatedResources = "${buildDir}/generated-resources/main" +Provider generatedResources = layout.buildDirectory.dir("generated-resources/main") configurations { loader { @@ -68,7 +68,7 @@ task reproducibleLoaderJar(type: Jar) { reproducibleFileOrder = true preserveFileTimestamps = false archiveFileName = "spring-boot-loader.jar" - destinationDirectory = file("${generatedResources}/META-INF/loader") + destinationDirectory = file(generatedResources.map {it.dir("META-INF/loader") }) } task reproducibleLoaderClassicJar(type: Jar) { @@ -83,7 +83,7 @@ task reproducibleLoaderClassicJar(type: Jar) { reproducibleFileOrder = true preserveFileTimestamps = false archiveFileName = "spring-boot-loader-classic.jar" - destinationDirectory = file("${generatedResources}/META-INF/loader") + destinationDirectory = file(generatedResources.map { it.dir("META-INF/loader") }) } task layerToolsJar(type: Sync) { @@ -92,7 +92,7 @@ task layerToolsJar(type: Sync) { file(configurations.jarmode.incoming.files.singleFile) } rename({ "spring-boot-jarmode-layertools.jar" }) - into(file("${generatedResources}/META-INF/jarmode")) + into(file(generatedResources.map { it.dir("META-INF/jarmode") })) } sourceSets { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index 0aabdb7f1f..4febb0bad1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -101,19 +101,19 @@ syncDocumentationSourceForAsciidoctor { task copySettingsXml(type: Copy) { from file("src/intTest/projects/settings.xml") - into "${buildDir}/generated-resources/settings" + into layout.buildDirectory.dir("generated-resources/settings") filter(springRepositoryTransformers.mavenSettings()) } sourceSets { main { - output.dir("${buildDir}/generated/resources/xsd", builtBy: "xsdResources") + output.dir(layout.buildDirectory.dir("generated/resources/xsd"), builtBy: "xsdResources") } intTest { - output.dir("${buildDir}/generated-resources", builtBy: ["extractVersionProperties", "copySettingsXml"]) + output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: ["extractVersionProperties", "copySettingsXml"]) } dockerTest { - output.dir("${buildDir}/generated-resources", builtBy: "extractVersionProperties") + output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: "extractVersionProperties") } } @@ -171,7 +171,7 @@ task zip(type: Zip) { task xsdResources(type: Sync) { from "src/main/xsd/layers-${project.ext.xsdVersion}.xsd" - into "${buildDir}/generated/resources/xsd/org/springframework/boot/maven" + into layout.buildDirectory.dir("generated/resources/xsd/org/springframework/boot/maven") rename { fileName -> "layers.xsd" } } diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle index c57caa35d6..1af141ef0b 100644 --- a/spring-boot-project/spring-boot/build.gradle +++ b/spring-boot-project/spring-boot/build.gradle @@ -9,7 +9,7 @@ plugins { description = "Spring Boot" -def tomcatConfigProperties = "$buildDir/tomcat-config-properties" +def tomcatConfigProperties = layout.buildDirectory.dir("tomcat-config-properties") configurations { tomcatDistribution diff --git a/spring-boot-system-tests/spring-boot-image-tests/build.gradle b/spring-boot-system-tests/spring-boot-image-tests/build.gradle index 81483d60e3..37e532b4af 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/build.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/build.gradle @@ -30,7 +30,7 @@ configurations { task syncMavenRepository(type: Sync) { from configurations.app - into "${buildDir}/system-test-maven-repository" + into layout.buildDirectory.dir("system-test-maven-repository") } systemTest { diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle index e98b3ce1b6..86dfba2942 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle @@ -25,17 +25,17 @@ dependencies { task syncMavenRepository(type: Sync) { from configurations.app - into "${buildDir}/docker-test-maven-repository" + into layout.buildDirectory.dir("docker-test-maven-repository") } task syncAppSource(type: org.springframework.boot.build.SyncAppSource) { sourceDirectory = file("spring-boot-launch-script-tests-app") - destinationDirectory = file("${buildDir}/spring-boot-launch-script-tests-app") + destinationDirectory = file(layout.buildDirectory.dir("spring-boot-launch-script-tests-app")) } task buildApp(type: GradleBuild) { dependsOn syncAppSource, syncMavenRepository - dir = "${buildDir}/spring-boot-launch-script-tests-app" + dir = layout.buildDirectory.dir("spring-boot-launch-script-tests-app") startParameter.buildCacheEnabled = false tasks = ["build"] } @@ -54,7 +54,7 @@ task syncJdkDownloads(type: Sync) { dependsOn downloadJdk from "${project.gradle.gradleUserHomeDir}/caches/springboot/downloads/jdk/bellsoft/" include "bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz" - into "${project.buildDir}/downloads/jdk/bellsoft/" + into layout.buildDirectory.dir("downloads/jdk/bellsoft/") } tasks.named("processDockerTestResources").configure { diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle index b8901f584f..bea6d3e8c3 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle @@ -22,17 +22,17 @@ dependencies { task syncMavenRepository(type: Sync) { from configurations.app - into "${buildDir}/docker-test-maven-repository" + into layout.buildDirectory.dir("docker-test-maven-repository") } task syncAppSource(type: org.springframework.boot.build.SyncAppSource) { sourceDirectory = file("spring-boot-loader-classic-tests-app") - destinationDirectory = file("${buildDir}/spring-boot-loader-classic-tests-app") + destinationDirectory = file(layout.buildDirectory.dir("spring-boot-loader-classic-tests-app")) } task buildApp(type: GradleBuild) { dependsOn syncAppSource, syncMavenRepository - dir = "${buildDir}/spring-boot-loader-classic-tests-app" + dir = layout.buildDirectory.dir("spring-boot-loader-classic-tests-app") startParameter.buildCacheEnabled = false tasks = ["build"] } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle index 876d450351..9cebfbd383 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle @@ -28,29 +28,29 @@ dependencies { task syncMavenRepository(type: Sync) { from configurations.app - into "${buildDir}/docker-test-maven-repository" + into layout.buildDirectory.dir("docker-test-maven-repository") } task syncAppSource(type: org.springframework.boot.build.SyncAppSource) { sourceDirectory = file("spring-boot-loader-tests-app") - destinationDirectory = file("${buildDir}/spring-boot-loader-tests-app") + destinationDirectory = file(layout.buildDirectory.dir("spring-boot-loader-tests-app")) } task buildApp(type: GradleBuild) { dependsOn syncAppSource, syncMavenRepository - dir = "${buildDir}/spring-boot-loader-tests-app" + dir = layout.buildDirectory.dir("spring-boot-loader-tests-app") startParameter.buildCacheEnabled = false tasks = ["build"] } task syncSignedJarAppSource(type: org.springframework.boot.build.SyncAppSource) { sourceDirectory = file("spring-boot-loader-tests-signed-jar") - destinationDirectory = file("${buildDir}/spring-boot-loader-tests-signed-jar") + destinationDirectory = file(layout.buildDirectory.dir("spring-boot-loader-tests-signed-jar")) } task buildSignedJarApp(type: GradleBuild) { dependsOn syncSignedJarAppSource, syncMavenRepository - dir = "${buildDir}/spring-boot-loader-tests-signed-jar" + dir = layout.buildDirectory.dir("spring-boot-loader-tests-signed-jar") startParameter.buildCacheEnabled = false tasks = ["build"] } @@ -69,7 +69,7 @@ task syncJdkDownloads(type: Sync) { dependsOn downloadJdk from "${project.gradle.gradleUserHomeDir}/caches/springboot/downloads/jdk/oracle/" include "jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz" - into "${project.buildDir}/downloads/jdk/oracle/" + into layout.buildDirectory.dir("downloads/jdk/oracle/") } tasks.named("processDockerTestResources").configure { diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle index b156f12b0d..52a71d3f85 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle @@ -29,7 +29,7 @@ dependencies { } task syncTestRepository(type: Sync) { - destinationDir = file("${buildDir}/test-repository") + destinationDir = file(layout.buildDirectory.dir("test-repository")) from { configurations.testRepository } @@ -37,12 +37,12 @@ task syncTestRepository(type: Sync) { task syncAppSource(type: org.springframework.boot.build.SyncAppSource) { sourceDirectory = file("spring-boot-server-tests-app") - destinationDirectory = file("${buildDir}/spring-boot-server-tests-app") + destinationDirectory = file(layout.buildDirectory.dir("spring-boot-server-tests-app")) } task buildApps(type: GradleBuild) { dependsOn syncAppSource, syncTestRepository - dir = "${buildDir}/spring-boot-server-tests-app" + dir = layout.buildDirectory.dir("spring-boot-server-tests-app") startParameter.buildCacheEnabled = false tasks = [ "jettyBootJar", @@ -56,15 +56,16 @@ task buildApps(type: GradleBuild) { intTest { inputs.files( - "${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-jetty.jar", - "${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-jetty.war", - "${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-resources.jar", - "${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-tomcat.jar", - "${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-tomcat.war", - "${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-undertow.jar", - "${buildDir}/spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-undertow.war") + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-jetty.jar"), + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-jetty.war"), + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-resources.jar"), + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-tomcat.jar"), + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-tomcat.war"), + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-undertow.jar"), + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-undertow.war") + ) .withPropertyName("applicationArchives") .withPathSensitivity(PathSensitivity.RELATIVE) .withNormalizer(ClasspathNormalizer) dependsOn buildApps -} \ No newline at end of file +} diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle index 5e1fd73fd4..43ef4f3d14 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle @@ -39,7 +39,7 @@ dependencies { } task syncTestRepository(type: Sync) { - destinationDir = file("${buildDir}/test-repository") + destinationDir = file(layout.buildDirectory.dir("test-repository")) from configurations.testRepository rename { it.replaceAll("-[0-9]+\\.[0-9]+-[0-9]+\\.", "-SNAPSHOT.") @@ -47,14 +47,14 @@ task syncTestRepository(type: Sync) { } task syncAntSources(type: Sync) { - destinationDir file("${buildDir}/ant") + destinationDir file(layout.buildDirectory.dir("ant")) from project.layout.projectDirectory include "*.xml" filter(springRepositoryTransformers.ant()) } task antRun(type: JavaExec) { - workingDir "${buildDir}/ant" + workingDir layout.buildDirectory.dir("ant") dependsOn syncTestRepository, syncAntSources, configurations.antDependencies classpath = configurations.antDependencies; mainClass = "org.apache.tools.ant.launch.Launcher"