Revert "Add @Conditional to prevent HATEOAS blowing up"

This reverts commit e6e8907770
which has an incorrect commit message.
pull/1116/head
Phillip Webb 11 years ago
parent 24471bc51e
commit d6a14c2b99

@ -114,16 +114,13 @@ public class RepackageTask extends DefaultTask {
}
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) {
mainClass = 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");
repackager.setMainClass(RepackageTask.this.mainClass);
}
getLogger().info("Setting mainClass: " + mainClass);
repackager.setMainClass(mainClass);
}
}

Loading…
Cancel
Save