Merge branch '2.2.x'

Closes gh-19001

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

@@ -68,7 +68,7 @@ class MainClassConventionTests {
 	}
 
 	@Test
-	void springBootExtensionMainClassNameIsUsedInPreferenceToMainClassNameProjectProperty() throws Exception {
+	void springBootExtensionMainClassNameIsUsedInPreferenceToJavaApplicationExtensionMainClassName() throws Exception {
 		this.project.getPlugins().apply(ApplicationPlugin.class);
 		JavaApplication javaApplication = this.project.getExtensions().findByType(JavaApplication.class);
 		javaApplication.setMainClassName("com.example.JavaApplicationMainClass");