Commit 20a2f214 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.2.x'

parents 36ca78f0 c3a040ac
...@@ -59,7 +59,6 @@ public class BootRunTask extends JavaExec { ...@@ -59,7 +59,6 @@ public class BootRunTask extends JavaExec {
} }
private void addResourcesIfNecessary() { private void addResourcesIfNecessary() {
System.out.println(this.addResources);
if (this.addResources) { if (this.addResources) {
SourceSet mainSourceSet = SourceSets.findMainSourceSet(getProject()); SourceSet mainSourceSet = SourceSets.findMainSourceSet(getProject());
final File outputDir = (mainSourceSet == null ? null : mainSourceSet final File outputDir = (mainSourceSet == null ? null : mainSourceSet
......
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