Skip to content

Commit 36b0a89

Browse files
committed
Fix functional tests
1 parent 11ccd36 commit 36b0a89

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPagePlugin.groovy

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,15 @@ class GroovyPagePlugin implements Plugin<Project> {
7272
war.classpath = war.classpath + project.files(destDir)
7373
}
7474
allTasks.withType(Jar) { Jar jar ->
75-
if(!(jar instanceof War) && (jar.name == 'bootJar')) {
76-
jar.dependsOn compileGroovyPages
77-
jar.from(destDir) {
78-
into("BOOT-INF/classes")
75+
if(!(jar instanceof War)) {
76+
if (jar.name == 'bootJar') {
77+
jar.dependsOn compileGroovyPages
78+
jar.from(destDir) {
79+
into("BOOT-INF/classes")
80+
}
81+
} else if(jar.name == 'jar') {
82+
jar.dependsOn compileGroovyPages
83+
jar.from destDir
7984
}
8085
}
8186
}

0 commit comments

Comments
 (0)