Skip to content

Commit b3a97bb

Browse files
committed
If a main class is not found skip bootRepackage. Fixes #10140
1 parent 7e354dd commit b3a97bb

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,10 +345,12 @@ class GrailsGradlePlugin extends GroovyPlugin {
345345
findMainClass.doLast {
346346
def bootExtension = project.extensions.findByType(SpringBootPluginExtension)
347347
def mainClassName = bootExtension.mainClass
348-
consoleTask.args mainClassName
349-
shellTask.args mainClassName
350-
project.tasks.withType(ApplicationContextCommandTask) { ApplicationContextCommandTask task ->
351-
task.args mainClassName
348+
if(mainClassName) {
349+
consoleTask.args mainClassName
350+
shellTask.args mainClassName
351+
project.tasks.withType(ApplicationContextCommandTask) { ApplicationContextCommandTask task ->
352+
task.args mainClassName
353+
}
352354
}
353355
}
354356

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.groovy

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import org.gradle.api.tasks.compile.GroovyCompile
3131
import org.gradle.language.jvm.tasks.ProcessResources
3232
import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry
3333
import org.grails.gradle.plugin.util.SourceSets
34+
import org.springframework.boot.gradle.SpringBootPluginExtension
3435

3536
import javax.inject.Inject
3637

@@ -170,12 +171,18 @@ class GrailsPluginGradlePlugin extends GrailsGradlePlugin {
170171
}
171172
}
172173

174+
@CompileStatic
173175
protected void configurePluginJarTask(Project project) {
174-
project.jar {
175-
exclude "application.yml"
176-
exclude "application.groovy"
177-
exclude "logback.groovy"
176+
def repackageTask = project.tasks.findByName('bootRepackage')
177+
repackageTask.onlyIf {
178+
def bootExtension = project.extensions.findByType(SpringBootPluginExtension)
179+
String mainClassName = bootExtension.mainClass
180+
mainClassName != null
178181
}
182+
Jar jarTask = (Jar)project.tasks.findByName('jar')
183+
jarTask.exclude "application.yml"
184+
jarTask.exclude "application.groovy"
185+
jarTask.exclude "logback.groovy"
179186
}
180187

181188
protected void configurePluginResources(Project project) {
@@ -232,6 +239,7 @@ withConfig(configuration) {
232239
}
233240
}
234241

242+
@CompileStatic
235243
protected void checkForConfigurationClash(Project project) {
236244
File yamlConfig = new File(project.projectDir,"grails-app/conf/plugin.yml")
237245
File groovyConfig = new File(project.projectDir,"grails-app/conf/plugin.groovy")

0 commit comments

Comments
 (0)