Skip to content

Commit 73150b7

Browse files
mhalbrittermhalbritter
committed
Merge branch '3.2.x' into 3.3.x
Closes spring-projectsgh-42772
2 parents fb9fee4 + ce106eb commit 73150b7

File tree

17 files changed

+75
-73
lines changed

17 files changed

+75
-73
lines changed

‎buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/DocumentAutoConfigurationClasses.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
import org.gradle.api.DefaultTask;
3232
import org.gradle.api.Task;
33+
import org.gradle.api.file.DirectoryProperty;
3334
import org.gradle.api.file.FileCollection;
34-
import org.gradle.api.file.RegularFileProperty;
3535
import org.gradle.api.tasks.InputFiles;
3636
import org.gradle.api.tasks.OutputDirectory;
3737
import org.gradle.api.tasks.TaskAction;
@@ -57,7 +57,7 @@ public void setAutoConfiguration(FileCollection autoConfiguration) {
5757
}
5858

5959
@OutputDirectory
60-
public abstract RegularFileProperty getOutputDir();
60+
public abstract DirectoryProperty getOutputDir();
6161

6262
@TaskAction
6363
void documentAutoConfigurationClasses() throws IOException {

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ def documentationTest = tasks.register("documentationTest", Test) {
207207
filter {
208208
includeTestsMatching("org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.*")
209209
}
210-
outputs.dir("${buildDir}/generated-snippets")
210+
outputs.dir(layout.buildDirectory.dir("generated-snippets"))
211211
develocity {
212212
predictiveTestSelection {
213213
enabled = false
@@ -225,12 +225,12 @@ def antoraActuatorRestApiLocalAggregateContent = tasks.register("antoraActuator
225225

226226
def antoraActuatorRestApiAggregateContent = tasks.register("antoraActuatorRestApiAggregateContent", Zip) {
227227
dependsOn documentationTest
228-
inputs.dir("${buildDir}/generated-snippets")
228+
inputs.dir(layout.buildDirectory.dir("generated-snippets"))
229229
.withPathSensitivity(PathSensitivity.RELATIVE)
230230
.withPropertyName("generatedSnippets")
231231
destinationDirectory = layout.buildDirectory.dir('generated/docs/antora-content')
232232
archiveClassifier = "actuator-rest-api-aggregate-content"
233-
from("${buildDir}/generated-snippets") {
233+
from(layout.buildDirectory.dir("generated-snippets")) {
234234
into "modules/api/partials/rest/actuator"
235235
}
236236
}

‎spring-boot-project/spring-boot-devtools/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ dependencies {
8484
}
8585

8686
task syncIntTestDependencies(type: Sync) {
87-
destinationDir = file("${buildDir}/dependencies")
87+
destinationDir = file(layout.buildDirectory.dir("dependencies"))
8888
from {
8989
configurations.intTestDependencies
9090
}

‎spring-boot-project/spring-boot-docs/build.gradle

+10-10
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ task aggregatedJavadoc(type: Javadoc) {
211211
dependsOn publishedProjects.javadoc
212212
source publishedProjects.javadoc.source
213213
classpath = project.files(publishedProjects.javadoc.classpath)
214-
destinationDir = project.file "${buildDir}/docs/javadoc"
214+
destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc"))
215215
options {
216216
author = true
217217
docTitle = "Spring Boot ${project.version} API"
@@ -244,33 +244,33 @@ task aggregatedJavadoc(type: Javadoc) {
244244

245245
task documentTestSlices(type: org.springframework.boot.build.test.autoconfigure.DocumentTestSlices) {
246246
testSlices = configurations.testSlices
247-
outputFile = file("${buildDir}/generated/docs/test-auto-configuration/documented-slices.adoc")
247+
outputFile = layout.buildDirectory.file("generated/docs/test-auto-configuration/documented-slices.adoc")
248248
}
249249

250250
task documentStarters(type: org.springframework.boot.build.starters.DocumentStarters) {
251-
outputDir = file("${buildDir}/generated/docs/using/starters/")
251+
outputDir = layout.buildDirectory.dir("generated/docs/using/starters/")
252252
}
253253

254254
task documentAutoConfigurationClasses(type: org.springframework.boot.build.autoconfigure.DocumentAutoConfigurationClasses) {
255255
autoConfiguration = configurations.autoConfiguration
256-
outputDir = file("${buildDir}/generated/docs/auto-configuration-classes/documented-auto-configuration-classes/")
256+
outputDir = layout.buildDirectory.dir("generated/docs/auto-configuration-classes/documented-auto-configuration-classes/")
257257
}
258258

259259
task documentDependencyVersionCoordinates(type: org.springframework.boot.build.constraints.DocumentConstrainedVersions) {
260260
dependsOn dependencyVersions
261261
constrainedVersions.set(providers.provider { dependencyVersions.constrainedVersions })
262-
outputFile = file("${buildDir}/generated/docs/dependency-versions/documented-coordinates.adoc")
262+
outputFile = layout.buildDirectory.file("generated/docs/dependency-versions/documented-coordinates.adoc")
263263
}
264264

265265
task documentDependencyVersionProperties(type: org.springframework.boot.build.constraints.DocumentVersionProperties) {
266266
dependsOn dependencyVersions
267267
versionProperties.set(providers.provider { dependencyVersions.versionProperties})
268-
outputFile = file("${buildDir}/generated/docs/dependency-versions/documented-properties.adoc")
268+
outputFile = layout.buildDirectory.file("generated/docs/dependency-versions/documented-properties.adoc")
269269
}
270270

271271
task documentConfigurationProperties(type: org.springframework.boot.build.context.properties.DocumentConfigurationProperties) {
272272
configurationPropertyMetadata = configurations.configurationProperties
273-
outputDir = file("${buildDir}/generated/docs/application-properties")
273+
outputDir = layout.buildDirectory.dir("generated/docs/application-properties")
274274
}
275275

276276
task documentDevtoolsPropertyDefaults(type: org.springframework.boot.build.devtools.DocumentDevtoolsPropertyDefaults) {}
@@ -279,7 +279,7 @@ task runRemoteSpringApplicationExample(type: org.springframework.boot.build.docs
279279
classpath = configurations.remoteSpringApplicationExample
280280
mainClass = "org.springframework.boot.devtools.RemoteSpringApplication"
281281
args = ["https://myapp.example.com", "--spring.devtools.remote.secret=secret", "--spring.devtools.livereload.port=0"]
282-
output = file("$buildDir/example-output/remote-spring-application.txt")
282+
output = layout.buildDirectory.file("example-output/remote-spring-application.txt")
283283
expectedLogging = "Started RemoteSpringApplication in "
284284
applicationJar = "/Users/myuser/.m2/repository/org/springframework/boot/spring-boot-devtools/${project.version}/spring-boot-devtools-${project.version}.jar"
285285
normalizeLiveReloadPort()
@@ -289,7 +289,7 @@ task runSpringApplicationExample(type: org.springframework.boot.build.docs.Appli
289289
classpath = configurations.springApplicationExample + sourceSets.main.output
290290
mainClass = "org.springframework.boot.docs.features.logexample.MyApplication"
291291
args = ["--server.port=0"]
292-
output = file("$buildDir/example-output/spring-application.txt")
292+
output = layout.buildDirectory.file("example-output/spring-application.txt")
293293
expectedLogging = "Started MyApplication in "
294294
normalizeTomcatPort()
295295
}
@@ -298,7 +298,7 @@ task runLoggingFormatExample(type: org.springframework.boot.build.docs.Applicati
298298
classpath = configurations.springApplicationExample + sourceSets.main.output
299299
mainClass = "org.springframework.boot.docs.features.logexample.MyApplication"
300300
args = ["--spring.main.banner-mode=off", "--server.port=0", "--spring.application.name=myapp"]
301-
output = file("$buildDir/example-output/logging-format.txt")
301+
output = layout.buildDirectory.file("example-output/logging-format.txt")
302302
expectedLogging = "Started MyApplication in "
303303
normalizeTomcatPort()
304304
}

‎spring-boot-project/spring-boot-test-autoconfigure/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,5 +131,5 @@ test {
131131

132132
task testSliceMetadata(type: org.springframework.boot.build.test.autoconfigure.TestSliceMetadata) {
133133
sourceSet = sourceSets.main
134-
outputFile = file("${buildDir}/test-slice-metadata.properties")
134+
outputFile = layout.buildDirectory.file("test-slice-metadata.properties")
135135
}

‎spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
}
2727

2828
task syncIntegrationTestSources(type: Sync) {
29-
destinationDir file("${buildDir}/it")
29+
destinationDir file(layout.buildDirectory.dir("it"))
3030
from file("src/it")
3131
filter(springRepositoryTransformers.ant())
3232
}
@@ -40,7 +40,7 @@ processResources {
4040

4141
task integrationTest {
4242
dependsOn syncIntegrationTestSources, jar
43-
def resultsDir = file("${buildDir}/test-results/integrationTest")
43+
def resultsDir = file(layout.buildDirectory.dir("test-results/integrationTest"))
4444
inputs.dir(file("src/it")).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("source")
4545
inputs.files(sourceSets.main.runtimeClasspath).withNormalizer(ClasspathNormalizer).withPropertyName("classpath")
4646
outputs.dirs resultsDir
@@ -62,9 +62,9 @@ task integrationTest {
6262
ant.propertyref(name: "ivy.class.path")
6363
}
6464
plainlistener()
65-
file("${buildDir}/test-results/integrationTest").mkdirs()
65+
file(layout.buildDirectory.dir("test-results/integrationTest")).mkdirs()
6666
xmllistener(toDir: resultsDir)
67-
fileset(dir: "${buildDir}/it", includes: "**/build.xml")
67+
fileset(dir: layout.buildDirectory.dir("it").get().asFile.toString(), includes: "**/build.xml")
6868
}
6969
}
7070
}

‎spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ task tar(type: Tar) {
106106

107107
task homebrewFormula(type: org.springframework.boot.build.cli.HomebrewFormula) {
108108
dependsOn tar
109-
outputDir = file("${buildDir}/homebrew")
109+
outputDir = layout.buildDirectory.dir("homebrew")
110110
template = file("src/main/homebrew/spring-boot.rb")
111111
archive = tar.archiveFile
112112
}
113113

114-
def homebrewFormulaArtifact = artifacts.add("archives", file("${buildDir}/homebrew/spring-boot.rb")) {
114+
def homebrewFormulaArtifact = artifacts.add("archives", file(layout.buildDirectory.file("homebrew/spring-boot.rb"))) {
115115
type "rb"
116116
classifier "homebrew"
117117
builtBy "homebrewFormula"

‎spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
description = "Spring Boot Loader Tools"
77

8-
def generatedResources = "${buildDir}/generated-resources/main"
8+
Provider<Directory> generatedResources = layout.buildDirectory.dir("generated-resources/main")
99

1010
configurations {
1111
loader {
@@ -62,7 +62,7 @@ task reproducibleLoaderJar(type: Jar) {
6262
reproducibleFileOrder = true
6363
preserveFileTimestamps = false
6464
archiveFileName = "spring-boot-loader.jar"
65-
destinationDirectory = file("${generatedResources}/META-INF/loader")
65+
destinationDirectory = file(generatedResources.map {it.dir("META-INF/loader") })
6666
}
6767

6868
task reproducibleLoaderClassicJar(type: Jar) {
@@ -77,7 +77,7 @@ task reproducibleLoaderClassicJar(type: Jar) {
7777
reproducibleFileOrder = true
7878
preserveFileTimestamps = false
7979
archiveFileName = "spring-boot-loader-classic.jar"
80-
destinationDirectory = file("${generatedResources}/META-INF/loader")
80+
destinationDirectory = file(generatedResources.map { it.dir("META-INF/loader") })
8181
}
8282

8383
task toolsJar(type: Sync) {
@@ -86,7 +86,7 @@ task toolsJar(type: Sync) {
8686
file(configurations.jarmode.incoming.files.singleFile)
8787
}
8888
rename({ "spring-boot-jarmode-tools.jar" })
89-
into(file("${generatedResources}/META-INF/jarmode"))
89+
into(file(generatedResources.map { it.dir("META-INF/jarmode") }))
9090
}
9191

9292
sourceSets {

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,19 @@ ext {
9393

9494
task copySettingsXml(type: Copy) {
9595
from file("src/intTest/projects/settings.xml")
96-
into "${buildDir}/generated-resources/settings"
96+
into layout.buildDirectory.dir("generated-resources/settings")
9797
filter(springRepositoryTransformers.mavenSettings())
9898
}
9999

100100
sourceSets {
101101
main {
102-
output.dir("${buildDir}/generated/resources/xsd", builtBy: "xsdResources")
102+
output.dir(layout.buildDirectory.dir("generated/resources/xsd"), builtBy: "xsdResources")
103103
}
104104
intTest {
105-
output.dir("${buildDir}/generated-resources", builtBy: ["extractVersionProperties", "copySettingsXml"])
105+
output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: ["extractVersionProperties", "copySettingsXml"])
106106
}
107107
dockerTest {
108-
output.dir("${buildDir}/generated-resources", builtBy: "extractVersionProperties")
108+
output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: "extractVersionProperties")
109109
}
110110
}
111111

@@ -124,7 +124,7 @@ javadoc {
124124

125125
task xsdResources(type: Sync) {
126126
from "src/main/xsd/layers-${project.ext.xsdVersion}.xsd"
127-
into "${buildDir}/generated/resources/xsd/org/springframework/boot/maven"
127+
into layout.buildDirectory.dir("generated/resources/xsd/org/springframework/boot/maven")
128128
rename { fileName -> "layers.xsd" }
129129
}
130130

‎spring-boot-project/spring-boot/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99

1010
description = "Spring Boot"
1111

12-
def tomcatConfigProperties = "$buildDir/tomcat-config-properties"
12+
def tomcatConfigProperties = layout.buildDirectory.dir("tomcat-config-properties")
1313

1414
configurations {
1515
tomcatDistribution

‎spring-boot-system-tests/spring-boot-image-tests/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ configurations {
3030

3131
task syncMavenRepository(type: Sync) {
3232
from configurations.app
33-
into "${buildDir}/system-test-maven-repository"
33+
into layout.buildDirectory.dir("system-test-maven-repository")
3434
}
3535

3636
systemTest {

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ dependencies {
2525

2626
task syncMavenRepository(type: Sync) {
2727
from configurations.app
28-
into "${buildDir}/docker-test-maven-repository"
28+
into layout.buildDirectory.dir("docker-test-maven-repository")
2929
}
3030

3131
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
3232
sourceDirectory = file("spring-boot-launch-script-tests-app")
33-
destinationDirectory = file("${buildDir}/spring-boot-launch-script-tests-app")
33+
destinationDirectory = file(layout.buildDirectory.dir("spring-boot-launch-script-tests-app"))
3434
}
3535

3636
task buildApp(type: GradleBuild) {
3737
dependsOn syncAppSource, syncMavenRepository
38-
dir = "${buildDir}/spring-boot-launch-script-tests-app"
38+
dir = layout.buildDirectory.dir("spring-boot-launch-script-tests-app")
3939
startParameter.buildCacheEnabled = false
4040
tasks = ["build"]
4141
}
@@ -54,7 +54,7 @@ task syncJdkDownloads(type: Sync) {
5454
dependsOn downloadJdk
5555
from "${project.gradle.gradleUserHomeDir}/caches/springboot/downloads/jdk/bellsoft/"
5656
include "bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz"
57-
into "${project.buildDir}/downloads/jdk/bellsoft/"
57+
into layout.buildDirectory.dir("downloads/jdk/bellsoft/")
5858
}
5959

6060
tasks.named("processDockerTestResources").configure {

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ dependencies {
2222

2323
task syncMavenRepository(type: Sync) {
2424
from configurations.app
25-
into "${buildDir}/docker-test-maven-repository"
25+
into layout.buildDirectory.dir("docker-test-maven-repository")
2626
}
2727

2828
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
2929
sourceDirectory = file("spring-boot-loader-classic-tests-app")
30-
destinationDirectory = file("${buildDir}/spring-boot-loader-classic-tests-app")
30+
destinationDirectory = file(layout.buildDirectory.dir("spring-boot-loader-classic-tests-app"))
3131
}
3232

3333
task buildApp(type: GradleBuild) {
3434
dependsOn syncAppSource, syncMavenRepository
35-
dir = "${buildDir}/spring-boot-loader-classic-tests-app"
35+
dir = layout.buildDirectory.dir("spring-boot-loader-classic-tests-app")
3636
startParameter.buildCacheEnabled = false
3737
tasks = ["build"]
3838
}

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,29 @@ dependencies {
2828

2929
task syncMavenRepository(type: Sync) {
3030
from configurations.app
31-
into "${buildDir}/docker-test-maven-repository"
31+
into layout.buildDirectory.dir("docker-test-maven-repository")
3232
}
3333

3434
task syncAppSource(type: org.springframework.boot.build.SyncAppSource) {
3535
sourceDirectory = file("spring-boot-loader-tests-app")
36-
destinationDirectory = file("${buildDir}/spring-boot-loader-tests-app")
36+
destinationDirectory = file(layout.buildDirectory.dir("spring-boot-loader-tests-app"))
3737
}
3838

3939
task buildApp(type: GradleBuild) {
4040
dependsOn syncAppSource, syncMavenRepository
41-
dir = "${buildDir}/spring-boot-loader-tests-app"
41+
dir = layout.buildDirectory.dir("spring-boot-loader-tests-app")
4242
startParameter.buildCacheEnabled = false
4343
tasks = ["build"]
4444
}
4545

4646
task syncSignedJarAppSource(type: org.springframework.boot.build.SyncAppSource) {
4747
sourceDirectory = file("spring-boot-loader-tests-signed-jar")
48-
destinationDirectory = file("${buildDir}/spring-boot-loader-tests-signed-jar")
48+
destinationDirectory = file(layout.buildDirectory.dir("spring-boot-loader-tests-signed-jar"))
4949
}
5050

5151
task buildSignedJarApp(type: GradleBuild) {
5252
dependsOn syncSignedJarAppSource, syncMavenRepository
53-
dir = "${buildDir}/spring-boot-loader-tests-signed-jar"
53+
dir = layout.buildDirectory.dir("spring-boot-loader-tests-signed-jar")
5454
startParameter.buildCacheEnabled = false
5555
tasks = ["build"]
5656
}
@@ -69,7 +69,7 @@ task syncJdkDownloads(type: Sync) {
6969
dependsOn downloadJdk
7070
from "${project.gradle.gradleUserHomeDir}/caches/springboot/downloads/jdk/oracle/"
7171
include "jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
72-
into "${project.buildDir}/downloads/jdk/oracle/"
72+
into layout.buildDirectory.dir("downloads/jdk/oracle/")
7373
}
7474

7575
tasks.named("processDockerTestResources").configure {

0 commit comments

Comments
 (0)