Merge branch '2.7.x' into 3.0.x

Closes gh-34460

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/com/example/bootrun/classpath/BootRunClasspathApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 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.
@@ -31,6 +31,7 @@ public class BootRunClasspathApplication {
 	}
 
 	public static void main(String[] args) {
+		System.out.println("Main class name = " + BootRunClasspathApplication.class.getName());
 		int i = 1;
 		for (String entry : ManagementFactory.getRuntimeMXBean().getClassPath().split(File.pathSeparator)) {
 			System.out.println(i++ + ". " + entry);

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

@@ -47,53 +47,46 @@ class JavaPluginActionIntegrationTests {
 
 	@TestTemplate
 	void noBootJarTaskWithoutJavaPluginApplied() {
-		assertThat(this.gradleBuild.build("taskExists", "-PtaskName=bootJar").getOutput())
-			.contains("bootJar exists = false");
+		assertThat(this.gradleBuild.build("tasks").getOutput()).doesNotContain("bootJar");
 	}
 
 	@TestTemplate
 	void applyingJavaPluginCreatesBootJarTask() {
-		assertThat(this.gradleBuild.build("taskExists", "-PtaskName=bootJar", "-PapplyJavaPlugin").getOutput())
-			.contains("bootJar exists = true");
+		assertThat(this.gradleBuild.build("tasks").getOutput()).contains("bootJar");
 	}
 
 	@TestTemplate
 	void noBootRunTaskWithoutJavaPluginApplied() {
-		assertThat(this.gradleBuild.build("taskExists", "-PtaskName=bootRun").getOutput())
-			.contains("bootRun exists = false");
+		assertThat(this.gradleBuild.build("tasks").getOutput()).doesNotContain("bootRun");
 	}
 
 	@TestTemplate
 	void applyingJavaPluginCreatesBootRunTask() {
-		assertThat(this.gradleBuild.build("taskExists", "-PtaskName=bootRun", "-PapplyJavaPlugin").getOutput())
-			.contains("bootRun exists = true");
+		assertThat(this.gradleBuild.build("tasks").getOutput()).contains("bootRun");
 	}
 
 	@TestTemplate
 	void javaCompileTasksUseUtf8Encoding() {
-		assertThat(this.gradleBuild.build("javaCompileEncoding", "-PapplyJavaPlugin").getOutput())
-			.contains("compileJava = UTF-8")
+		assertThat(this.gradleBuild.build("build").getOutput()).contains("compileJava = UTF-8")
 			.contains("compileTestJava = UTF-8");
 	}
 
 	@TestTemplate
 	void javaCompileTasksUseParametersCompilerFlagByDefault() {
-		assertThat(this.gradleBuild.build("javaCompileTasksCompilerArgs").getOutput())
-			.contains("compileJava compiler args: [-parameters]")
+		assertThat(this.gradleBuild.build("build").getOutput()).contains("compileJava compiler args: [-parameters]")
 			.contains("compileTestJava compiler args: [-parameters]");
 	}
 
 	@TestTemplate
 	void javaCompileTasksUseParametersAndAdditionalCompilerFlags() {
-		assertThat(this.gradleBuild.build("javaCompileTasksCompilerArgs").getOutput())
+		assertThat(this.gradleBuild.build("build").getOutput())
 			.contains("compileJava compiler args: [-parameters, -Xlint:all]")
 			.contains("compileTestJava compiler args: [-parameters, -Xlint:all]");
 	}
 
 	@TestTemplate
 	void javaCompileTasksCanOverrideDefaultParametersCompilerFlag() {
-		assertThat(this.gradleBuild.build("javaCompileTasksCompilerArgs").getOutput())
-			.contains("compileJava compiler args: [-Xlint:all]")
+		assertThat(this.gradleBuild.build("build").getOutput()).contains("compileJava compiler args: [-Xlint:all]")
 			.contains("compileTestJava compiler args: [-Xlint:all]");
 	}
 
@@ -139,16 +132,12 @@ class JavaPluginActionIntegrationTests {
 
 	@TestTemplate
 	void applyingJavaPluginCreatesDevelopmentOnlyConfiguration() {
-		assertThat(this.gradleBuild
-			.build("configurationExists", "-PconfigurationName=developmentOnly", "-PapplyJavaPlugin")
-			.getOutput()).contains("developmentOnly exists = true");
+		assertThat(this.gradleBuild.build("build").getOutput()).contains("developmentOnly exists = true");
 	}
 
 	@TestTemplate
 	void productionRuntimeClasspathIsConfiguredWithAttributes() {
-		assertThat(this.gradleBuild
-			.build("configurationAttributes", "-PconfigurationName=productionRuntimeClasspath", "-PapplyJavaPlugin")
-			.getOutput()).contains("3 productionRuntimeClasspath attributes:")
+		assertThat(this.gradleBuild.build("build").getOutput()).contains("3 productionRuntimeClasspath attributes:")
 			.contains("org.gradle.usage: java-runtime")
 			.contains("org.gradle.libraryelements: jar")
 			.contains("org.gradle.dependency.bundling: external");
@@ -156,18 +145,11 @@ class JavaPluginActionIntegrationTests {
 
 	@TestTemplate
 	void productionRuntimeClasspathIsConfiguredWithResolvabilityAndConsumabilityThatMatchesRuntimeClasspath() {
-		String runtime = this.gradleBuild
-			.build("configurationResolvabilityAndConsumability", "-PconfigurationName=runtimeClasspath",
-					"-PapplyJavaPlugin")
-			.getOutput();
-		assertThat(runtime).contains("canBeResolved: true");
-		assertThat(runtime).contains("canBeConsumed: false");
-		String productionRuntime = this.gradleBuild
-			.build("configurationResolvabilityAndConsumability", "-PconfigurationName=productionRuntimeClasspath",
-					"-PapplyJavaPlugin")
-			.getOutput();
-		assertThat(productionRuntime).contains("canBeResolved: true");
-		assertThat(productionRuntime).contains("canBeConsumed: false");
+		String output = this.gradleBuild.build("build").getOutput();
+		assertThat(output).contains("runtimeClasspath canBeResolved: true");
+		assertThat(output).contains("runtimeClasspath canBeConsumed: false");
+		assertThat(output).contains("productionRuntimeClasspath canBeResolved: true");
+		assertThat(output).contains("productionRuntimeClasspath canBeConsumed: false");
 	}
 
 	@TestTemplate

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

@@ -22,7 +22,6 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.gradle.testkit.runner.BuildResult;
-import org.gradle.testkit.runner.TaskOutcome;
 import org.junit.jupiter.api.TestTemplate;
 
 import org.springframework.boot.gradle.junit.GradleCompatibility;
@@ -45,9 +44,7 @@ class BootJarIntegrationTests extends AbstractBootArchiveIntegrationTests {
 
 	@TestTemplate
 	void whenAResolvableCopyOfAnUnresolvableConfigurationIsResolvedThenResolutionSucceeds() {
-		BuildResult build = this.gradleBuild.build("resolveResolvableCopyOfUnresolvableConfiguration");
-		assertThat(build.task(":resolveResolvableCopyOfUnresolvableConfiguration").getOutcome())
-			.isEqualTo(TaskOutcome.SUCCESS);
+		this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.0").build("build");
 	}
 
 	@TestTemplate

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 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.
@@ -16,10 +16,14 @@
 
 package org.springframework.boot.gradle.tasks.bundling;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.assertj.core.api.Assumptions;
+import org.gradle.util.GradleVersion;
+
 import org.springframework.boot.gradle.junit.GradleCompatibility;
 
 /**
@@ -42,4 +46,25 @@ class BootWarIntegrationTests extends AbstractBootArchiveIntegrationTests {
 		return contents.toArray(new String[0]);
 	}
 
+	@Override
+	void multiModuleImplicitLayers() throws IOException {
+		whenTestingWithTheConfigurationCacheAssumeThatTheGradleVersionIsLessThan8();
+		super.multiModuleImplicitLayers();
+	}
+
+	@Override
+	void multiModuleCustomLayers() throws IOException {
+		whenTestingWithTheConfigurationCacheAssumeThatTheGradleVersionIsLessThan8();
+		super.multiModuleCustomLayers();
+	}
+
+	private void whenTestingWithTheConfigurationCacheAssumeThatTheGradleVersionIsLessThan8() {
+		if (this.gradleBuild.isConfigurationCache()) {
+			// With Gradle 8.0, a configuration cache bug prevents ResolvedDependencies
+			// from processing dependencies on the runtime classpath
+			Assumptions.assumeThat(GradleVersion.version(this.gradleBuild.getGradleVersion()))
+				.isLessThan(GradleVersion.version("8.0"));
+		}
+	}
+
 }

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

@@ -24,8 +24,10 @@ import java.util.jar.Attributes;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 
+import org.assertj.core.api.Assumptions;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
+import org.gradle.util.GradleVersion;
 import org.junit.jupiter.api.TestTemplate;
 
 import org.springframework.boot.gradle.junit.GradleCompatibility;
@@ -108,6 +110,13 @@ class BootRunIntegrationTests {
 
 	@TestTemplate
 	void applicationPluginJvmArgumentsAreUsed() throws IOException {
+		if (this.gradleBuild.isConfigurationCache()) {
+			// https://github.com/gradle/gradle/pull/23924
+			GradleVersion gradleVersion = GradleVersion.version(this.gradleBuild.getGradleVersion());
+			Assumptions.assumeThat(gradleVersion)
+				.isLessThan(GradleVersion.version("8.0"))
+				.isGreaterThanOrEqualTo(GradleVersion.version("8.1-rc-1"));
+		}
 		copyJvmArgsApplication();
 		BuildResult result = this.gradleBuild.build("bootRun");
 		assertThat(result.task(":bootRun").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);