Merge branch '2.7.x' into 3.0.x

Closes gh-35707

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java

@@ -36,6 +36,8 @@ import org.gradle.api.tasks.TaskProvider;
 import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator;
 import org.gradle.jvm.application.tasks.CreateStartScripts;
 
+import org.springframework.boot.gradle.tasks.run.BootRun;
+
 /**
  * Action that is executed in response to the {@link ApplicationPlugin} being applied.
  *
@@ -56,6 +58,10 @@ final class ApplicationPluginAction implements PluginApplicationAction {
 		CopySpec binCopySpec = project.copySpec().into("bin").from(bootStartScripts);
 		binCopySpec.setFileMode(0755);
 		distribution.getContents().with(binCopySpec);
+		project.getTasks()
+			.named(SpringBootPlugin.BOOT_RUN_TASK_NAME, BootRun.class)
+			.configure((bootRun) -> bootRun.getConventionMapping()
+				.map("jvmArgs", javaApplication::getApplicationDefaultJvmArgs));
 	}
 
 	private void configureCreateStartScripts(Project project, JavaApplication javaApplication,

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.gradle.plugin;
 
 import java.io.File;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Callable;
@@ -182,16 +181,10 @@ final class JavaPluginAction implements PluginApplicationAction {
 			.findByName(SourceSet.MAIN_SOURCE_SET_NAME)
 			.getRuntimeClasspath()
 			.filter(new JarTypeFileSpec());
-		project.getTasks().register("bootRun", BootRun.class, (run) -> {
+		project.getTasks().register(SpringBootPlugin.BOOT_RUN_TASK_NAME, BootRun.class, (run) -> {
 			run.setDescription("Runs this project as a Spring Boot application.");
 			run.setGroup(ApplicationPlugin.APPLICATION_GROUP);
 			run.classpath(classpath);
-			run.getConventionMapping().map("jvmArgs", () -> {
-				if (project.hasProperty("applicationDefaultJvmArgs")) {
-					return project.property("applicationDefaultJvmArgs");
-				}
-				return Collections.emptyList();
-			});
 			run.getMainClass().convention(resolveMainClassName.flatMap(ResolveMainClassName::readMainClassName));
 			configureToolchainConvention(project, run);
 		});

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -70,6 +70,8 @@ public class SpringBootPlugin implements Plugin<Project> {
 	 */
 	public static final String BOOT_BUILD_IMAGE_TASK_NAME = "bootBuildImage";
 
+	static final String BOOT_RUN_TASK_NAME = "bootRun";
+
 	/**
 	 * The name of the {@code developmentOnly} configuration.
 	 * @since 2.3.0

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java

@@ -56,7 +56,7 @@ class NativeImagePluginActionIntegrationTests {
 	@TestTemplate
 	void reachabilityMetadataConfigurationFilesAreCopiedToJar() throws IOException {
 		writeDummySpringApplicationAotProcessorMainClass();
-		BuildResult result = this.gradleBuild.build("bootJar");
+		BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1").build("bootJar");
 		assertThat(result.task(":bootJar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs");
 		File jarFile = new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".jar");
@@ -74,7 +74,7 @@ class NativeImagePluginActionIntegrationTests {
 		writeDummySpringApplicationAotProcessorMainClass();
 		FileSystemUtils.copyRecursively(new File("src/test/resources/reachability-metadata-repository"),
 				new File(this.gradleBuild.getProjectDir(), "reachability-metadata-repository"));
-		BuildResult result = this.gradleBuild.build("bootJar");
+		BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1").build("bootJar");
 		assertThat(result.task(":bootJar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs");
 		File jarFile = new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".jar");
@@ -90,27 +90,31 @@ class NativeImagePluginActionIntegrationTests {
 	@TestTemplate
 	void bootBuildImageIsConfiguredToBuildANativeImage() {
 		writeDummySpringApplicationAotProcessorMainClass();
-		BuildResult result = this.gradleBuild.build("bootBuildImageConfiguration");
+		BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1")
+			.build("bootBuildImageConfiguration");
 		assertThat(result.getOutput()).contains("paketobuildpacks/builder:tiny").contains("BP_NATIVE_IMAGE = true");
 	}
 
 	@TestTemplate
 	void developmentOnlyDependenciesDoNotAppearInNativeImageClasspath() {
 		writeDummySpringApplicationAotProcessorMainClass();
-		BuildResult result = this.gradleBuild.build("checkNativeImageClasspath");
+		BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1")
+			.build("checkNativeImageClasspath");
 		assertThat(result.getOutput()).doesNotContain("commons-lang");
 	}
 
 	@TestTemplate
 	void classesGeneratedDuringAotProcessingAreOnTheNativeImageClasspath() {
-		BuildResult result = this.gradleBuild.build("checkNativeImageClasspath");
+		BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1")
+			.build("checkNativeImageClasspath");
 		assertThat(result.getOutput()).contains(projectPath("build/classes/java/aot"),
 				projectPath("build/resources/aot"), projectPath("build/generated/aotClasses"));
 	}
 
 	@TestTemplate
 	void classesGeneratedDuringAotTestProcessingAreOnTheTestNativeImageClasspath() {
-		BuildResult result = this.gradleBuild.build("checkTestNativeImageClasspath");
+		BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1")
+			.build("checkTestNativeImageClasspath");
 		assertThat(result.getOutput()).contains(projectPath("build/classes/java/aotTest"),
 				projectPath("build/resources/aotTest"), projectPath("build/generated/aotTestClasses"));
 	}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests-applicationNameCanBeUsedToCustomizeDistributionName.gradle

@@ -4,7 +4,9 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-applicationName = 'custom'
+application {
+	applicationName = 'custom'
+}
 
 bootJar {
 	mainClass = 'com.example.ExampleApplication'

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

@@ -4,7 +4,9 @@ plugins {
 
 if (project.hasProperty('applyApplicationPlugin')) {
 	apply plugin: 'application'
-	applicationDefaultJvmArgs = ['-Dcom.example.a=alpha', '-Dcom.example.b=bravo']
+	application {
+		applicationDefaultJvmArgs = ['-Dcom.example.a=alpha', '-Dcom.example.b=bravo']
+	}
 }
 
 task('taskExists') {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCommandLineOptions.gradle

@@ -3,5 +3,7 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	imageName = "example/test-image-custom"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	imageName = "example/test-image-name"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootJar {
 	launchScript()

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle

@@ -7,8 +7,10 @@ if (project.hasProperty('applyWarPlugin')) {
 	apply plugin: 'war'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle

@@ -9,8 +9,10 @@ if (project.hasProperty('applyWarPlugin')) {
 	apply plugin: 'war'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle

@@ -3,8 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle

@@ -7,8 +7,10 @@ if (project.hasProperty('applyWarPlugin')) {
 	apply plugin: 'war'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle

@@ -3,10 +3,12 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-sourceCompatibility = '1.8'
+java {
-targetCompatibility = '1.8'
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	publish = true
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-applicationPluginMainClassNameIsUsed.gradle

@@ -4,4 +4,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-mainClassName = 'com.example.CustomMain'
+application {
+	mainClass = 'com.example.CustomMain'
+}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests-applicationPluginMainClassNameIsUsed.gradle

@@ -4,4 +4,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-mainClassName = 'com.example.CustomMain'
+application {
+	mainClass = 'com.example.CustomMain'
+}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/run/BootRunIntegrationTests-applicationPluginMainClassNameIsUsed.gradle

@@ -3,4 +3,6 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-mainClassName = 'com.example.bootrun.main.CustomMainClass'
+application {
+	mainClass = 'com.example.bootrun.main.CustomMainClass'
+}

spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

@@ -32,7 +32,7 @@ public final class GradleVersions {
 	}
 
 	public static List<String> allCompatible() {
-		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.1.1");
+		return Arrays.asList("7.5.1", GradleVersion.current().getVersion(), "8.0.2", "8.1.1", "8.2-rc-1");
 	}
 
 	public static String minimumCompatible() {