Commit d6a14c2b authored by Phillip Webb's avatar Phillip Webb

Revert "Add @Conditional to prevent HATEOAS blowing up"

This reverts commit e6e89077
which has an incorrect commit message.
parent 24471bc5
...@@ -114,16 +114,13 @@ public class RepackageTask extends DefaultTask { ...@@ -114,16 +114,13 @@ public class RepackageTask extends DefaultTask {
} }
private void setMainClass(Repackager repackager) { private void setMainClass(Repackager repackager) {
String mainClass = (String) getProject().property("mainClassName"); repackager.setMainClass((String) getProject().property("mainClassName"));
if (this.extension.getMainClass() != null) {
repackager.setMainClass(this.extension.getMainClass());
}
if (RepackageTask.this.mainClass != null) { if (RepackageTask.this.mainClass != null) {
mainClass = RepackageTask.this.mainClass; repackager.setMainClass(RepackageTask.this.mainClass);
} else if (this.extension.getMainClass() != null) {
mainClass = this.extension.getMainClass();
} else if (getProject().getTasks().getByName("run").hasProperty("main")) {
mainClass = (String) getProject().getTasks().getByName("run").property("main");
} }
getLogger().info("Setting mainClass: " + mainClass);
repackager.setMainClass(mainClass);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment