Merge branch '2.3.x' into 2.4.x

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

@@ -156,14 +156,14 @@ class JavaPluginActionIntegrationTests {
 
 	@TestTemplate
 	void productionRuntimeClasspathIsConfiguredWithResolvabilityAndConsumabilityThatMatchesRuntimeClasspath() {
-		String productionRuntime = this.gradleBuild.build("configurationResolvabilityAndConsumability",
-				"-PconfigurationName=runtimeClasspath", "-PapplyJavaPlugin").getOutput();
-		assertThat(productionRuntime).contains("canBeResolved: true");
-		assertThat(productionRuntime).contains("canBeConsumed: false");
 		String runtime = this.gradleBuild.build("configurationResolvabilityAndConsumability",
-				"-PconfigurationName=productionRuntimeClasspath", "-PapplyJavaPlugin").getOutput();
+				"-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");
 	}
 
 	private void createMinimalMainSource() throws IOException {