(grails-core) branch 7.0.x updated: Fix wrapper copy from distro rename

[jd...@apache.org]

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

jdaugherty pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git


The following commit(s) were added to refs/heads/7.0.x by this push:
     new f5fd6292ec Fix wrapper copy from distro rename
f5fd6292ec is described below

commit f5fd6292ece32d5f4fac9c0fc5a4812ca8f8b3ae
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Sun Jun 1 22:25:08 2025 -0400

    Fix wrapper copy from distro rename
---
 grails-profiles/base/build.gradle | 6 +++++-
 grails-wrapper/build.gradle       | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/grails-profiles/base/build.gradle b/grails-profiles/base/build.gradle
index 1fd0cb869a..f78c4c2aa0 100644
--- a/grails-profiles/base/build.gradle
+++ b/grails-profiles/base/build.gradle
@@ -38,7 +38,11 @@ TaskProvider<Copy> copyWrapper = tasks.register('copyGrailsWrapperScripts', Copy
 copyWrapper.configure { Copy copy ->
     Project wrapperProject = rootProject.project(':grails-wrapper')
     copy.dependsOn(wrapperProject.tasks.named('installDist'))
-    copy.from(wrapperProject.layout.buildDirectory.dir('install/grails-wrapper'))
+    copy.from(wrapperProject.layout.buildDirectory.dir('install/apache-grails-wrapper-incubating-bin')) {
+        include '**/grails-wrapper.jar'
+        include '**/grailsw.bat'
+        include '**/grailsw'
+    }
     copy.into(project.layout.projectDirectory.dir('skeleton'))
 }
 
diff --git a/grails-wrapper/build.gradle b/grails-wrapper/build.gradle
index b6be5601ee..9e9a02617c 100644
--- a/grails-wrapper/build.gradle
+++ b/grails-wrapper/build.gradle
@@ -87,6 +87,7 @@ startScripts.configure { CreateStartScripts t ->
 }
 
 project.extensions.getByType(DistributionContainer).configureEach {
+    // WARNING: changing the distro name / classifier requires updating the task in grails-profiles-base to copy from the correct location
     it.distributionBaseName = 'apache-grails-wrapper'
     it.distributionClassifier = 'incubating-bin'
     it.contents {