Merge branch '3.0.x'

Closes gh-35708

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	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'
-targetCompatibility = '1.8'
+java {
+	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'
-targetCompatibility = '1.8'
+java {
+	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'
-targetCompatibility = '1.8'
+java {
+	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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"

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'
-targetCompatibility = '1.8'
+java {
+	sourceCompatibility = '1.8'
+	targetCompatibility = '1.8'
+}
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.2"
 	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'
+}