You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2025/05/16 12:53:50 UTC

(grails-core) branch corrupt-jar-fixes updated (ace09b2553 -> f5a5894324)

This is an automated email from the ASF dual-hosted git repository.

jdaugherty pushed a change to branch corrupt-jar-fixes
in repository https://gitbox.apache.org/repos/asf/grails-core.git


    from ace09b2553 Add helper repo for debugging grails-bom locally in test apps
     new 6efaaaf5ec Fix nested directory copy
     new f5a5894324 Switch back to 3.4.3 until spring framework 6.2.7 is released

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dependencies.gradle                                           |  3 ++-
 .../grails/gradle/plugin/views/gsp/GroovyPagePlugin.groovy    | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)


(grails-core) 01/02: Fix nested directory copy

Posted by jd...@apache.org.
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 <jd...@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
                 }


(grails-core) 02/02: Switch back to 3.4.3 until spring framework 6.2.7 is released

Posted by jd...@apache.org.
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 f5a5894324e75f4cf690eff836616e8ae981815a
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Fri May 16 08:53:41 2025 -0400

    Switch back to 3.4.3 until spring framework 6.2.7 is released
---
 dependencies.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 26c8d2fd31..bac1e74020 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -42,7 +42,8 @@ ext {
             'objenesis.version'                  : '3.4',
             'gradle-spock.version'               : '2.3-groovy-3.0',
             'gradle-nexus-publish-plugin.version': '2.0.0',
-            'spring-boot.version': '3.5.0-RC1',
+            // 3.4.4 to 3.5.0-RC1 has https://github.com/spring-projects/spring-framework/issues/34796 which prevents running apps via jar (nested jar failures)
+            'spring-boot.version': '3.4.3',
             'springloaded.version'               : '1.2.8.RELEASE',
     ]