Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to checkstyle 6.17

Browse Source 
Fixes gh-5547
This commit is contained in:
Phillip Webb
2016-03-31 13:12:49 -07:00
parent 4f200a852b
commit 893a6c32f3
23 changed files with 67 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/RepackageTask.java
View File

@@ -240,30 +240,31 @@ public class RepackageTask extends DefaultTask {
}
private void setMainClass(Repackager repackager) {
String mainClass;
if (getProject().hasProperty("mainClassName")) {
mainClass = (String) getProject().property("mainClassName");
}
else {
ExtraPropertiesExtension extraProperties = (ExtraPropertiesExtension) getProject()
.getExtensions().getByName("ext");
mainClass = (String) extraProperties.get("mainClassName");
}
String mainClassName = getMainClassNameProperty();
if (RepackageTask.this.mainClass != null) {
mainClass = RepackageTask.this.mainClass;
mainClassName = RepackageTask.this.mainClass;
}
else if (this.extension.getMainClass() != null) {
mainClass = this.extension.getMainClass();
mainClassName = this.extension.getMainClass();
}
else {
Task runTask = getProject().getTasks().findByName("run");
if (runTask != null && runTask.hasProperty("main")) {
mainClass = (String) getProject().getTasks().getByName("run")
mainClassName = (String) getProject().getTasks().getByName("run")
.property("main");
}
}
getLogger().info("Setting mainClass: " + mainClass);
repackager.setMainClass(mainClass);
getLogger().info("Setting mainClass: " + mainClassName);
repackager.setMainClass(mainClassName);
}
private String getMainClassNameProperty() {
if (getProject().hasProperty("mainClassName")) {
return (String) getProject().property("mainClassName");
}
ExtraPropertiesExtension extraProperties = (ExtraPropertiesExtension) getProject()
.getExtensions().getByName("ext");
return (String) extraProperties.get("mainClassName");
}
private LaunchScript getLaunchScript() throws IOException {