Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-03-26 10:01:01 +00:00
commit 20a2f21493

View File

@ -59,7 +59,6 @@ public class BootRunTask extends JavaExec {
}
private void addResourcesIfNecessary() {
System.out.println(this.addResources);
if (this.addResources) {
SourceSet mainSourceSet = SourceSets.findMainSourceSet(getProject());
final File outputDir = (mainSourceSet == null ? null : mainSourceSet