Skip to content

Commit b053c52

Browse files
committed
Fix inclusion of GSPs in boot jar. Issue #11251
1 parent f73581e commit b053c52

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ micronautSpringVersion=1.0.0.RC1
88
gradleSdkVendorVersion=1.1.1
99
jaxbVersion=2.3.1
1010
javaxAnnotationApiVersion=1.3.2
11-
datastoreVersion=7.0.0.RC1
11+
datastoreVersion=7.0.0.RC2
1212
antVersion=1.9.7
1313
aspectjVersion=1.9.2
1414
gdocEngineVersion=1.0.1

grails-bom/plugins.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
hibernate5=7.0.0.RC1
2-
mongodb=7.0.0.RC1
3-
neo4j=7.0.0.RC1
1+
hibernate5=7.0.0.RC2
2+
mongodb=7.0.0.RC2
3+
neo4j=7.0.0.RC2
44
cache=4.0.0
55
rxjava=1.1.1
66
rxjava2=2.0.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ 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 == 'jar')) {
75+
if(!(jar instanceof War) && (jar.name == 'jar' || jar.name == 'bootJar')) {
7676
jar.dependsOn compileGroovyPages
7777
jar.from destDir
7878
}

0 commit comments

Comments
 (0)