This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch corrupt-jar-fixes in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 6efaaaf5ec014ef7519c70ceacee6962788804da Author: James Daugherty <jdaughe...@jdresources.net> AuthorDate: Fri May 16 08:53:11 2025 -0400 Fix nested directory copy --- .../grails/gradle/plugin/views/gsp/GroovyPagePlugin.groovy | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/gsp/GroovyPagePlugin.groovy b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/gsp/GroovyPagePlugin.groovy index 6bf541257d..ba24b3b2e9 100644 --- a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/gsp/GroovyPagePlugin.groovy +++ b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/views/gsp/GroovyPagePlugin.groovy @@ -19,6 +19,7 @@ package org.grails.gradle.plugin.views.gsp import groovy.transform.CompileStatic import org.gradle.api.Plugin import org.gradle.api.Project +import org.gradle.api.file.CopySpec import org.gradle.api.file.Directory import org.gradle.api.file.DuplicatesStrategy import org.gradle.api.file.FileCollection @@ -88,8 +89,9 @@ class GroovyPagePlugin implements Plugin<Project> { war.dependsOn compileGroovyPages war.duplicatesStrategy = DuplicatesStrategy.EXCLUDE if (war.name == 'bootWar') { - war.from(destDir) - war.into("WEB-INF/classes") + war.from(destDir) { CopySpec it -> + it.into("WEB-INF/classes") + } } else if (war.name == 'war') { war.from destDir } @@ -106,8 +108,9 @@ class GroovyPagePlugin implements Plugin<Project> { jar.duplicatesStrategy = DuplicatesStrategy.EXCLUDE if (!(jar instanceof War)) { if (jar.name == 'bootJar') { - jar.from(destDir) - jar.into("BOOT-INF/classes") + jar.from(destDir) { CopySpec it -> + it.into("BOOT-INF/classes") + } } else if (jar.name == 'jar') { jar.from destDir }