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

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2016-03-29 11:16:16 +01:00
parent abd86e50e0 1043239de0
commit fc463afb89
3 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/FindMainClassTask.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2015 the original author or authors.
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import org.gradle.api.Task;
import org.gradle.api.plugins.ApplicationPluginConvention;
import org.gradle.api.plugins.ExtraPropertiesExtension;
import org.gradle.api.tasks.Input;
import org.gradle.api.tasks.JavaExec;
import org.gradle.api.tasks.SourceSetOutput;
import org.gradle.api.tasks.TaskAction;
@@ -85,9 +86,9 @@ public class FindMainClassTask extends DefaultTask {
mainClass = application.getMainClassName();
}
Task runTask = project.getTasks().findByName("run");
JavaExec runTask = findRunTask(project);
if (mainClass == null && runTask != null) {
mainClass = (String) runTask.property("main");
mainClass = runTask.getMain();
}
if (mainClass == null) {
@@ -122,9 +123,17 @@ public class FindMainClassTask extends DefaultTask {
application.setMainClassName(mainClass);
}
if (runTask != null && !runTask.hasProperty("main")) {
runTask.setProperty("main", mainClass);
runTask.setMain(mainClass);
}
return mainClass;
}
private JavaExec findRunTask(Project project) {
Task runTask = project.getTasks().findByName("run");
if (runTask instanceof JavaExec) {
return (JavaExec) runTask;
}
return null;
}
}