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

Merge branch '3.3.x'

Browse Source 
Closes gh-43649 in 3.4.x
Closes gh-43651
This commit is contained in:
Andy Wilkinson
2025-01-02 12:22:59 +00:00
parent 530a26e9f9 d8a9ebd14b
commit 51d15c7c78
54 changed files with 353 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/getting-started/apply-plugin-snapshot.gradle
View File

@@ -1,6 +1,8 @@
buildscript {
repositories {
maven { url 'https://repo.spring.io/libs-snapshot' }
maven {
url = 'https://repo.spring.io/libs-snapshot'
}
}
dependencies {

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/getting-started/milestone-settings.gradle
View File

@@ -1,6 +1,8 @@
pluginManagement {
repositories {
maven { url 'https://repo.spring.io/milestone' }
maven {
url = 'https://repo.spring.io/milestone'
}
gradlePluginPortal()
}
}

8
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/getting-started/snapshot-settings.gradle
View File

@@ -1,7 +1,11 @@
pluginManagement {
repositories {
maven { url 'https://repo.spring.io/milestone' }
maven { url 'https://repo.spring.io/snapshot' }
maven {
url = 'https://repo.spring.io/milestone'
}
maven {
url = 'https://repo.spring.io/snapshot'
}
gradlePluginPortal()
}
}

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

@@ -8,8 +8,9 @@ apply(plugin = "io.spring.dependency-management")
// end::apply[]
tasks.register("verify") {
val plugins = project.plugins
doLast {
project.plugins.getPlugin(JavaPlugin::class)
project.plugins.getPlugin(io.spring.gradle.dependencymanagement.DependencyManagementPlugin::class)
plugins.getPlugin(JavaPlugin::class)
plugins.getPlugin(io.spring.gradle.dependencymanagement.DependencyManagementPlugin::class)
}
}

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/configure-bom.gradle
View File

@@ -24,5 +24,7 @@ dependencyManagement {
}
repositories {
maven { url 'repository' }
maven {
url = 'repository'
}
}

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/configure-platform.gradle
View File

@@ -14,7 +14,9 @@ dependencies {
}
repositories {
maven { url 'repository' }
maven {
url = 'repository'
}
}
configurations.all {

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

@@ -9,7 +9,9 @@ dependencies {
}
repositories {
maven { url 'repository' }
maven {
url = 'repository'
}
}
configurations.all {

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

@@ -19,7 +19,9 @@ ext['slf4j.version'] = '1.7.20'
// end::custom-version[]
repositories {
maven { url 'repository' }
maven {
url = 'repository'
}
}
task slf4jVersion {

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

@@ -27,7 +27,8 @@ the<DependencyManagementExtension>().apply {
}
tasks.register("slf4jVersion") {
val dependencyManagement = project.the<DependencyManagementExtension>()
doLast {
println(project.the<DependencyManagementExtension>().managedVersions["org.slf4j:slf4j-api"])
println(dependencyManagement.managedVersions["org.slf4j:slf4j-api"])
}
}

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/depend-on-plugin-milestone.gradle
View File

@@ -1,6 +1,8 @@
buildscript {
repositories {
maven { url 'https://repo.spring.io/libs-milestone' }
maven {
url = 'https://repo.spring.io/libs-milestone'
}
}
dependencies {

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/managing-dependencies/depend-on-plugin-snapshot.gradle
View File

@@ -1,6 +1,8 @@
buildscript {
repositories {
maven { url 'https://repo.spring.io/libs-snapshot' }
maven {
url = 'https://repo.spring.io/libs-snapshot'
}
}
dependencies {

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/examples/publishing/maven-publish.gradle
View File

@@ -13,7 +13,7 @@ publishing {
}
repositories {
maven {
url 'https://repo.example.com'
url = 'https://repo.example.com'
}
}
}

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -181,7 +181,7 @@ class BuildInfoTests {
}
private BuildInfo createTask(Project project) {
return project.getTasks().create("testBuildInfo", BuildInfo.class);
return project.getTasks().register("testBuildInfo", BuildInfo.class).get();
}
private Properties buildInfoProperties(BuildInfo task) {

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -116,7 +116,7 @@ abstract class AbstractBootArchiveTests<T extends Jar & BootArchive> {
projectDir.mkdirs();
this.project = GradleProjectBuilder.builder().withProjectDir(projectDir).build();
this.project.setDescription("Test project for " + this.taskClass.getSimpleName());
this.task = configure(this.project.getTasks().create("testArchive", this.taskClass));
this.task = this.project.getTasks().register("testArchive", this.taskClass, this::configure).get();
}
@Test

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ class BootBuildImageTests {
projectDir.mkdirs();
this.project = GradleProjectBuilder.builder().withProjectDir(projectDir).withName("build-image-test").build();
this.project.setDescription("Test project for BootBuildImage");
this.buildImage = this.project.getTasks().create("buildImage", BootBuildImage.class);
this.buildImage = this.project.getTasks().register("buildImage", BootBuildImage.class).get();
}
@Test

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

@@ -16,9 +16,9 @@ task('taskExists') {
}
task('distributionExists') {
def distributions = project.extensions.findByType(DistributionContainer)
doFirst {
boolean found = project.hasProperty('distributions') &&
distributions.findByName(distributionName) != null
boolean found = distributions != null && distributions.findByName(distributionName) != null
println "${distributionName} exists = ${found}"
}
}

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

@@ -17,12 +17,15 @@ if (project.hasProperty('applyDependencyManagementPlugin')) {
}
repositories {
maven { url 'repository' }
maven {
url = 'repository'
}
}
task doesNotHaveDependencyManagement {
def extensions = project.extensions
doLast {
if (project.extensions.findByName('dependencyManagement') != null) {
if (extensions.findByName('dependencyManagement') != null) {
throw new GradleException('Found dependency management extension')
}
}

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

@@ -17,7 +17,9 @@ dependencyManagement {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {
@@ -25,8 +27,9 @@ dependencies {
}
task kotlinVersion {
def properties = project.properties
doLast {
def kotlinVersion = project.hasProperty('kotlin.version') ? project.getProperty('kotlin.version') : 'none'
def kotlinVersion = properties.getOrDefault('kotlin.version', 'none')
println "Kotlin version: ${kotlinVersion}"
}
}

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

@@ -3,8 +3,9 @@ plugins {
}
task kotlinVersion {
def properties = project.properties
doLast {
def kotlinVersion = project.hasProperty('kotlin.version') ? project.getProperty('kotlin.version') : 'none'
def kotlinVersion = properties.getOrDefault('kotlin.version', 'none')
println "Kotlin version: ${kotlinVersion}"
}
}

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

@@ -6,7 +6,9 @@ plugins {
apply plugin: 'io.spring.dependency-management'
repositories {
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencyManagement {

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

@@ -7,7 +7,9 @@ apply plugin: 'org.springframework.boot.aot'
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
configurations.all {

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

@@ -6,7 +6,9 @@ plugins {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
configurations.all {

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

@@ -7,7 +7,9 @@ apply plugin: 'org.springframework.boot.aot'
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
configurations.all {

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

@@ -6,7 +6,9 @@ plugins {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
configurations.all {

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

@@ -27,7 +27,9 @@ bootJar {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {

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

@@ -5,7 +5,9 @@ plugins {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {

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

@@ -9,7 +9,9 @@ bootJar {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {

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

@@ -13,7 +13,9 @@ bootJar {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {

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

@@ -42,7 +42,9 @@ bootJar {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {

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

@@ -20,7 +20,9 @@ bootJar {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {

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

@@ -10,7 +10,9 @@ task launch(type: JavaExec) {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {

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

@@ -9,7 +9,9 @@ bootJar {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {

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

@@ -28,7 +28,9 @@ bootWar {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {

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

@@ -10,7 +10,9 @@ bootWar {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {

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

@@ -14,7 +14,9 @@ bootWar {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {

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

@@ -43,7 +43,9 @@ bootWar {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {

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

@@ -21,7 +21,9 @@ bootWar {
repositories {
mavenCentral()
maven { url 'repository' }
maven {
url = 'repository'
}
}
dependencies {