Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

Browse Source 
Closes gh-45193
This commit is contained in:
Phillip Webb
2025-04-14 16:18:50 -07:00
parent e3610eaf0c b80bdbb182
commit 4bbbc0d687
41 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ dependencies {
implementation("org.springframework:spring-core")
}
task syncIntegrationTestSources(type: Sync) {
tasks.register("syncIntegrationTestSources", Sync) {
destinationDir = file(layout.buildDirectory.dir("it"))
from file("src/it")
filter(springRepositoryTransformers.ant())
@@ -39,7 +39,7 @@ processResources {
inputs.property "version", version
}
task integrationTest {
tasks.register("integrationTest") {
dependsOn syncIntegrationTestSources, jar
def resultsDir = file(layout.buildDirectory.dir("test-results/integrationTest"))
inputs.dir(file("src/it")).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("source")

8
spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle
View File

@@ -46,7 +46,7 @@ dependencies {
testImplementation("org.springframework:spring-test")
}
task fullJar(type: Jar) {
tasks.register("fullJar", Jar) {
dependsOn configurations.loader
archiveClassifier = "full"
entryCompression = "stored"
@@ -89,7 +89,7 @@ def configureArchive(archive) {
}
}
task zip(type: Zip) {
tasks.register("zip", Zip) {
archiveClassifier = "bin"
configureArchive it
}
@@ -98,14 +98,14 @@ intTest {
dependsOn zip
}
task tar(type: Tar) {
tasks.register("tar", Tar) {
compression = "gzip"
archiveExtension = "tar.gz"
configureArchive it
}
if (BuildProperties.get(project).buildType() == BuildType.OPEN_SOURCE) {
task homebrewFormula(type: org.springframework.boot.build.cli.HomebrewFormula) {
tasks.register("homebrewFormula", org.springframework.boot.build.cli.HomebrewFormula) {
dependsOn tar
outputDir = layout.buildDirectory.dir("homebrew")
template = file("src/main/homebrew/spring-boot.rb")

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View File

@@ -87,7 +87,7 @@ gradlePlugin {
}
}
task preparePluginValidationClasses(type: Copy) {
tasks.register("preparePluginValidationClasses", Copy) {
destinationDir = layout.buildDirectory.dir("classes/java/pluginValidation").get().asFile
from(sourceSets.main.output.classesDirs) {
exclude "**/CreateBootStartScripts.class"

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/getting-started/typical-plugins.gradle
View File

@@ -7,7 +7,7 @@ plugins {
apply plugin: 'io.spring.dependency-management'
// end::apply[]
task verify {
tasks.register("verify") {
doLast {
plugins.getPlugin(org.gradle.api.plugins.JavaPlugin.class)
plugins.getPlugin(io.spring.gradle.dependencymanagement.DependencyManagementPlugin.class)

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/custom-version.gradle
View File

@@ -24,7 +24,7 @@ repositories {
}
}
task slf4jVersion {
tasks.register("slf4jVersion") {
doLast {
println dependencyManagement.managedVersions['org.slf4j:slf4j-api']
}

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/DependencyManagementPluginActionIntegrationTests.gradle
View File

@@ -22,7 +22,7 @@ repositories {
}
}
task doesNotHaveDependencyManagement {
tasks.register("doesNotHaveDependencyManagement") {
def extensions = project.extensions
doLast {
if (extensions.findByName('dependencyManagement') != null) {
@@ -31,7 +31,7 @@ task doesNotHaveDependencyManagement {
}
}
task hasDependencyManagement {
tasks.register("hasDependencyManagement") {
doLast {
if (!dependencyManagement.managedVersions) {
throw new GradleException('No managed versions have been configured')

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-kotlinVersionPropertyIsSet.gradle
View File

@@ -26,7 +26,7 @@ dependencies {
implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8')
}
task kotlinVersion {
tasks.register("kotlinVersion") {
def properties = project.properties
doLast {
def kotlinVersion = properties.getOrDefault('kotlin.version', 'none')

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-noKotlinVersionPropertyWithoutKotlinPlugin.gradle
View File

@@ -2,7 +2,7 @@ plugins {
id 'org.springframework.boot' version '{version}'
}
task kotlinVersion {
tasks.register("kotlinVersion") {
def properties = project.properties
doLast {
def kotlinVersion = properties.getOrDefault('kotlin.version', 'none')

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-basicExecution.gradle
View File

@@ -4,7 +4,7 @@ plugins {
version = '0.1.0'
task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
tasks.register("buildInfo", org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
properties {
artifact = 'foo'
group = 'foo'

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-defaultValues.gradle
View File

@@ -2,4 +2,4 @@ plugins {
id 'org.springframework.boot' version '{version}' apply false
}
task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo)
tasks.register("buildInfo", org.springframework.boot.gradle.tasks.buildinfo.BuildInfo)

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-excludeProperties.gradle
View File

@@ -5,6 +5,6 @@ plugins {
group = 'foo'
version = '0.1.0'
task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
tasks.register("buildInfo", org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
excludes = ['group', 'artifact', 'version', 'name']
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-notUpToDateWhenExecutedTwiceAsTimeChanges.gradle
View File

@@ -2,4 +2,4 @@ plugins {
id 'org.springframework.boot' version '{version}' apply false
}
task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo)
tasks.register("buildInfo", org.springframework.boot.gradle.tasks.buildinfo.BuildInfo)

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-notUpToDateWhenExecutedTwiceWithFixedTimeAndChangedGradlePropertiesProjectVersion.gradle
View File

@@ -2,7 +2,7 @@ plugins {
id 'org.springframework.boot' version '{version}' apply false
}
task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
tasks.register("buildInfo", org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
excludes = ["time"]
properties {
artifact = 'example'

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-notUpToDateWhenExecutedTwiceWithFixedTimeAndChangedProjectVersion.gradle
View File

@@ -4,7 +4,7 @@ plugins {
version = '{projectVersion}'
task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
tasks.register("buildInfo", org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
excludes = ["time"]
properties {
artifact = 'example'

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-reproducibleOutputWithFixedTime.gradle
View File

@@ -2,6 +2,6 @@ plugins {
id 'org.springframework.boot' version '{version}' apply false
}
task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
tasks.register("buildInfo", org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
excludes = ["time"]
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests-upToDateWhenExecutedTwiceWithFixedTime.gradle
View File

@@ -2,6 +2,6 @@ plugins {
id 'org.springframework.boot' version '{version}' apply false
}
task buildInfo(type: org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
tasks.register("buildInfo", org.springframework.boot.gradle.tasks.buildinfo.BuildInfo) {
excludes = ["time"]
}

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-customLayers.gradle
View File

@@ -38,13 +38,13 @@ dependencies {
implementation("org.springframework:spring-core:5.2.5.RELEASE")
}
task listLayers(type: JavaExec) {
tasks.register("listLayers", JavaExec) {
classpath = bootJar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "list-layers"
}
task extractLayers(type: JavaExec) {
tasks.register("extractLayers", JavaExec) {
classpath = bootJar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "extract", "--layers", "--launcher", "--destination", ".", "--force"

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-explodedApplicationClasspath.gradle
View File

@@ -15,13 +15,13 @@ dependencies {
implementation("org.apache.commons:commons-lang3:3.9")
}
task explode(type: Sync) {
tasks.register("explode", Sync) {
dependsOn(bootJar)
destinationDir = layout.buildDirectory.dir("exploded").get().asFile
from zipTree(files(bootJar).singleFile)
}
task launch(type: JavaExec) {
tasks.register("launch", JavaExec) {
classpath = files(explode)
mainClass = 'org.springframework.boot.loader.launch.JarLauncher'
}

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-implicitLayers.gradle
View File

@@ -21,13 +21,13 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-logging:2.2.0.RELEASE")
}
task listLayers(type: JavaExec) {
tasks.register("listLayers", JavaExec) {
classpath = bootJar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "list-layers"
}
task extractLayers(type: JavaExec) {
tasks.register("extractLayers", JavaExec) {
classpath = bootJar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "extract", "--layers", "--launcher", "--destination", ".", "--force"

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-layersWithCustomSourceSet.gradle
View File

@@ -24,13 +24,13 @@ dependencies {
implementation("org.springframework:spring-core:5.2.5.RELEASE")
}
task listLayers(type: JavaExec) {
tasks.register("listLayers", JavaExec) {
classpath = bootJar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "list-layers"
}
task extractLayers(type: JavaExec) {
tasks.register("extractLayers", JavaExec) {
classpath = bootJar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "extract", "--layers", "--launcher", "--destination", ".", "--force"

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleCustomLayers.gradle
View File

@@ -55,13 +55,13 @@ dependencies {
implementation("org.springframework:spring-core:5.2.5.RELEASE")
}
task listLayers(type: JavaExec) {
tasks.register("listLayers", JavaExec) {
classpath = bootJar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "list-layers"
}
task extractLayers(type: JavaExec) {
tasks.register("extractLayers", JavaExec) {
classpath = bootJar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "extract", "--layers", "--launcher", "--destination", ".", "--force"

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-multiModuleImplicitLayers.gradle
View File

@@ -33,13 +33,13 @@ dependencies {
implementation("org.springframework:spring-core:5.2.5.RELEASE")
}
task listLayers(type: JavaExec) {
tasks.register("listLayers", JavaExec) {
classpath = bootJar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "list-layers"
}
task extractLayers(type: JavaExec) {
tasks.register("extractLayers", JavaExec) {
classpath = bootJar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "extract", "--layers", "--launcher", "--destination", ".", "--force"

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-packagedApplicationClasspath.gradle
View File

@@ -4,7 +4,7 @@ plugins {
id 'org.springframework.boot' version '{version}'
}
task launch(type: JavaExec) {
tasks.register("launch", JavaExec) {
classpath = files(bootJar)
}

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-customLayers.gradle
View File

@@ -39,13 +39,13 @@ dependencies {
implementation("org.springframework:spring-core:5.2.5.RELEASE")
}
task listLayers(type: JavaExec) {
tasks.register("listLayers", JavaExec) {
classpath = bootWar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "list-layers"
}
task extractLayers(type: JavaExec) {
tasks.register("extractLayers", JavaExec) {
classpath = bootWar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "extract", "--layers", "--launcher", "--destination", ".", "--force"

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-implicitLayers.gradle
View File

@@ -22,13 +22,13 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-logging:2.2.0.RELEASE")
}
task listLayers(type: JavaExec) {
tasks.register("listLayers", JavaExec) {
classpath = bootWar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "list-layers"
}
task extractLayers(type: JavaExec) {
tasks.register("extractLayers", JavaExec) {
classpath = bootWar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "extract", "--layers", "--launcher", "--destination", ".", "--force"

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-layersWithCustomSourceSet.gradle
View File

@@ -25,13 +25,13 @@ dependencies {
implementation("org.springframework:spring-core:5.2.5.RELEASE")
}
task listLayers(type: JavaExec) {
tasks.register("listLayers", JavaExec) {
classpath = bootWar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "list-layers"
}
task extractLayers(type: JavaExec) {
tasks.register("extractLayers", JavaExec) {
classpath = bootWar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "extract", "--layers", "--launcher", "--destination", ".", "--force"

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-multiModuleCustomLayers.gradle
View File

@@ -56,13 +56,13 @@ dependencies {
implementation("org.springframework:spring-core:5.2.5.RELEASE")
}
task listLayers(type: JavaExec) {
tasks.register("listLayers", JavaExec) {
classpath = bootWar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "list-layers"
}
task extractLayers(type: JavaExec) {
tasks.register("extractLayers", JavaExec) {
classpath = bootWar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "extract", "--layers", "--launcher", "--destination", ".", "--force"

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-multiModuleImplicitLayers.gradle
View File

@@ -34,13 +34,13 @@ dependencies {
implementation("org.springframework:spring-core:5.2.5.RELEASE")
}
task listLayers(type: JavaExec) {
tasks.register("listLayers", JavaExec) {
classpath = bootWar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "list-layers"
}
task extractLayers(type: JavaExec) {
tasks.register("extractLayers", JavaExec) {
classpath = bootWar.outputs.files
systemProperties = [ "jarmode": "tools" ]
args "extract", "--layers", "--launcher", "--destination", ".", "--force"

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

@@ -39,7 +39,7 @@ dependencies {
testImplementation("org.zeroturnaround:zt-zip:1.13")
}
task reproducibleLoaderJar(type: Jar) {
tasks.register("reproducibleLoaderJar", Jar) {
dependsOn configurations.loader
from {
zipTree(configurations.loader.incoming.files.singleFile).matching {
@@ -54,7 +54,7 @@ task reproducibleLoaderJar(type: Jar) {
destinationDirectory = file(generatedResources.map {it.dir("META-INF/loader") })
}
task reproducibleLoaderClassicJar(type: Jar) {
tasks.register("reproducibleLoaderClassicJar", Jar) {
dependsOn configurations.loaderClassic
from {
zipTree(configurations.loaderClassic.incoming.files.singleFile).matching {
@@ -69,7 +69,7 @@ task reproducibleLoaderClassicJar(type: Jar) {
destinationDirectory = file(generatedResources.map { it.dir("META-INF/loader") })
}
task toolsJar(type: Sync) {
tasks.register("toolsJar", Sync) {
dependsOn configurations.jarmode
from {
file(configurations.jarmode.incoming.files.singleFile)

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
View File

@@ -90,7 +90,7 @@ ext {
xsdVersion = versionElements[0] + "." + versionElements[1]
}
task copySettingsXml(type: Copy) {
tasks.register("copySettingsXml", Copy) {
from file("src/intTest/projects/settings.xml")
into layout.buildDirectory.dir("generated-resources/settings")
filter(springRepositoryTransformers.mavenSettings())
@@ -121,7 +121,7 @@ javadoc {
}
}
task xsdResources(type: Sync) {
tasks.register("xsdResources", Sync) {
from "src/main/xsd/layers-${project.ext.xsdVersion}.xsd"
into layout.buildDirectory.dir("generated/resources/xsd/org/springframework/boot/maven")
rename { fileName -> "layers.xsd" }