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 5702f6c8ea [skip ci] switch to `-all` classifier for shadowjars
5702f6c8ea is described below
commit 5702f6c8eaa300df76a9d504a1af9bb999bb0d85
Author: James Daugherty <[email protected]>
AuthorDate: Tue Jul 8 23:13:52 2025 -0400
[skip ci] switch to `-all` classifier for shadowjars
---
grails-wrapper/src/main/java/grails/init/GrailsUpdater.java | 7 ++++---
grails-wrapper/src/main/java/grails/init/GrailsWrapperHome.java | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/grails-wrapper/src/main/java/grails/init/GrailsUpdater.java
b/grails-wrapper/src/main/java/grails/init/GrailsUpdater.java
index c404f8f8d0..064fad9b29 100644
--- a/grails-wrapper/src/main/java/grails/init/GrailsUpdater.java
+++ b/grails-wrapper/src/main/java/grails/init/GrailsUpdater.java
@@ -149,8 +149,9 @@ public class GrailsUpdater {
private boolean updateJar(GrailsWrapperRepo repo, GrailsVersion version,
String snapshotVersion) {
boolean success = false;
- final String localJarFilename =
GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + version.version;
- final String remoteJarFilename = snapshotVersion != null ?
GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + snapshotVersion :
GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + version.version;
+ final String localJarFilename =
GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + version.version + "-all";
+ // shadowjars will always have the 'all' classifier
+ final String remoteJarFilename = snapshotVersion != null ?
GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + snapshotVersion :
GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + version.version + "-all";
final String jarFileExtension = ".jar";
try {
@@ -256,7 +257,7 @@ public class GrailsUpdater {
if (!directory.exists()) {
directory.mkdirs();
}
- Path jarFile = new File(directory,
GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + version.version +
".jar").toPath();
+ Path jarFile = new File(directory,
GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + version.version +
"-all.jar").toPath();
System.out.println("...Moving " + (isLocal ? "local" : "remotely") + "
downloaded jar to: " + jarFile.toAbsolutePath());
Files.move(downloadJarLocation.getAbsoluteFile().toPath(), jarFile,
REPLACE_EXISTING);
diff --git a/grails-wrapper/src/main/java/grails/init/GrailsWrapperHome.java
b/grails-wrapper/src/main/java/grails/init/GrailsWrapperHome.java
index 25ade71ab5..bf88b3ed1b 100644
--- a/grails-wrapper/src/main/java/grails/init/GrailsWrapperHome.java
+++ b/grails-wrapper/src/main/java/grails/init/GrailsWrapperHome.java
@@ -74,7 +74,7 @@ public class GrailsWrapperHome {
return null;
}
- return new File(implDirectory, CLI_COMBINED_PROJECT_NAME + "-" +
version.version + ".jar");
+ return new File(implDirectory, CLI_COMBINED_PROJECT_NAME + "-" +
version.version + "-all.jar");
}
void cleanupOtherVersions(GrailsVersion toKeep) {