This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch wrapper-rewrite in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit d05660d1b6bf9c3507bfa9c6ae800fbb6644a336 Author: James Daugherty <[email protected]> AuthorDate: Wed May 14 00:34:22 2025 -0400 Various fixes to wrapper from testing --- grails-wrapper/src/main/java/grails/init/GrailsUpdater.java | 5 +++-- grails-wrapper/src/main/java/grails/init/GrailsWrapperHome.java | 6 +++--- grails-wrapper/src/main/java/grails/init/GrailsWrapperRepo.java | 2 +- grails-wrapper/src/main/java/grails/init/Start.java | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/grails-wrapper/src/main/java/grails/init/GrailsUpdater.java b/grails-wrapper/src/main/java/grails/init/GrailsUpdater.java index 9ea1422e96..b37fe55ac1 100644 --- a/grails-wrapper/src/main/java/grails/init/GrailsUpdater.java +++ b/grails-wrapper/src/main/java/grails/init/GrailsUpdater.java @@ -63,7 +63,8 @@ public class GrailsUpdater { } public File getExecutedJarFile() { - return grailsWrapperHome.getWrapperImplementation(grailsWrapperHome.getVersionDirectory(getSelectedVersion())); + GrailsVersion selectedVersion = getSelectedVersion(); + return grailsWrapperHome.getWrapperImplementation(selectedVersion, grailsWrapperHome.getVersionDirectory(selectedVersion)); } /** @@ -221,7 +222,7 @@ public class GrailsUpdater { } private String fetchSnapshotForVersion(GrailsWrapperRepo repo, GrailsVersion baseVersion) throws IOException, SAXException, ParserConfigurationException { - System.out.println("...A Grails snapshot version has been detected. Downloading latest snapshot."); + System.out.println("...A Grails snapshot version has been detected. Downloading latest snapshot."); SAXParserFactory factory = SAXParserFactory.newInstance(); SAXParser saxParser = factory.newSAXParser(); diff --git a/grails-wrapper/src/main/java/grails/init/GrailsWrapperHome.java b/grails-wrapper/src/main/java/grails/init/GrailsWrapperHome.java index 232b70d56e..cf2b29f7ba 100644 --- a/grails-wrapper/src/main/java/grails/init/GrailsWrapperHome.java +++ b/grails-wrapper/src/main/java/grails/init/GrailsWrapperHome.java @@ -64,15 +64,15 @@ public class GrailsWrapperHome { File getLatestWrapperImplementation() { File implDirectory = getLatestVersionDirectory(); - return getWrapperImplementation(implDirectory); + return getWrapperImplementation(latestVersion, implDirectory); } - File getWrapperImplementation(File implDirectory) { + File getWrapperImplementation(GrailsVersion version, File implDirectory) { if(implDirectory == null) { return null; } - return new File(implDirectory, CLI_COMBINED_PROJECT_NAME + ".jar"); + return new File(implDirectory, CLI_COMBINED_PROJECT_NAME + "-" + version.version + ".jar"); } void cleanupOtherVersions(GrailsVersion toKeep) { diff --git a/grails-wrapper/src/main/java/grails/init/GrailsWrapperRepo.java b/grails-wrapper/src/main/java/grails/init/GrailsWrapperRepo.java index 87a9ba102f..55224018e5 100644 --- a/grails-wrapper/src/main/java/grails/init/GrailsWrapperRepo.java +++ b/grails-wrapper/src/main/java/grails/init/GrailsWrapperRepo.java @@ -54,7 +54,7 @@ public class GrailsWrapperRepo { String configured = getConfiguredMavenUrl(); if (configured != null) { - System.out.println("... Update Repository is overridden to: " + configured); + System.out.println("...Update Repository is overridden to: " + configured); repo.baseUrl = configured; } else { // default to upstream snapshots or groups diff --git a/grails-wrapper/src/main/java/grails/init/Start.java b/grails-wrapper/src/main/java/grails/init/Start.java index 5531be7454..26764c0d1b 100644 --- a/grails-wrapper/src/main/java/grails/init/Start.java +++ b/grails-wrapper/src/main/java/grails/init/Start.java @@ -70,7 +70,7 @@ public class Start { URLClassLoader child = new URLClassLoader(new URL[]{updater.getExecutedJarFile().toURI().toURL()}); Class<?> classToLoad = Class.forName("org.apache.grails.cli.DelegatingShellApplication", true, child); Method main = classToLoad.getMethod("main", String[].class); - main.invoke(null, (Object[]) adjustedArgs); + main.invoke(null, (Object) adjustedArgs); } catch (Exception e) { e.printStackTrace(); System.exit(1);
