Skip to content

Commit 5702f6c

Browse files
committed
[skip ci] switch to -all classifier for shadowjars
1 parent 00df05c commit 5702f6c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

grails-wrapper/src/main/java/grails/init/GrailsUpdater.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,9 @@ public boolean update() {
149149
private boolean updateJar(GrailsWrapperRepo repo, GrailsVersion version, String snapshotVersion) {
150150
boolean success = false;
151151

152-
final String localJarFilename = GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + version.version;
153-
final String remoteJarFilename = snapshotVersion != null ? GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + snapshotVersion : GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + version.version;
152+
final String localJarFilename = GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + version.version + "-all";
153+
// shadowjars will always have the 'all' classifier
154+
final String remoteJarFilename = snapshotVersion != null ? GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + snapshotVersion : GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + version.version + "-all";
154155
final String jarFileExtension = ".jar";
155156

156157
try {
@@ -256,7 +257,7 @@ private boolean downloadWrapperJar(GrailsVersion version, File downloadJarLocati
256257
if (!directory.exists()) {
257258
directory.mkdirs();
258259
}
259-
Path jarFile = new File(directory, GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + version.version + ".jar").toPath();
260+
Path jarFile = new File(directory, GrailsWrapperHome.CLI_COMBINED_PROJECT_NAME + "-" + version.version + "-all.jar").toPath();
260261
System.out.println("...Moving " + (isLocal ? "local" : "remotely") + " downloaded jar to: " + jarFile.toAbsolutePath());
261262
Files.move(downloadJarLocation.getAbsoluteFile().toPath(), jarFile, REPLACE_EXISTING);
262263

grails-wrapper/src/main/java/grails/init/GrailsWrapperHome.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ File getWrapperImplementation(GrailsVersion version, File implDirectory) {
7474
return null;
7575
}
7676

77-
return new File(implDirectory, CLI_COMBINED_PROJECT_NAME + "-" + version.version + ".jar");
77+
return new File(implDirectory, CLI_COMBINED_PROJECT_NAME + "-" + version.version + "-all.jar");
7878
}
7979

8080
void cleanupOtherVersions(GrailsVersion toKeep) {

0 commit comments

Comments
 (0)