Merge branch '2.2.x'

Closes gh-19001
This commit is contained in:
Stephane Nicoll
2019-11-13 08:53:19 +01:00

View File

@@ -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");