From 08095df50ec35baedba6b3de767ce88fbf1cf006 Mon Sep 17 00:00:00 2001 From: Rahul Krishna Date: Sat, 8 Feb 2025 16:40:27 -0500 Subject: [PATCH 1/3] The gradlew/mvnw path must be made absolute Signed-off-by: Rahul Krishna --- src/main/java/com/ibm/cldk/utils/BuildProject.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ibm/cldk/utils/BuildProject.java b/src/main/java/com/ibm/cldk/utils/BuildProject.java index 33c2a057..87ae62e5 100644 --- a/src/main/java/com/ibm/cldk/utils/BuildProject.java +++ b/src/main/java/com/ibm/cldk/utils/BuildProject.java @@ -34,7 +34,7 @@ public class BuildProject { public static String getMavenCommand() { String mvnSystemCommand = Arrays.stream(System.getenv("PATH").split(System.getProperty("path.separator"))).map(path -> new File(path, System.getProperty("os.name").toLowerCase().contains("windows") ? "mvn.cmd" : "mvn")).filter(File::exists).findFirst().map(File::getAbsolutePath).orElse(null); File mvnWrapper = System.getProperty("os.name").toLowerCase().contains("windows") ? new File(projectRootPom, "mvnw.cmd") : new File(projectRootPom, "mvnw"); - return commandExists(mvnWrapper).getKey() ? mvnWrapper.toString() : mvnSystemCommand; + return commandExists(mvnWrapper.getAbsoluteFile()).getKey() ? mvnWrapper.getAbsoluteFile().toString() : mvnSystemCommand; } /** @@ -46,7 +46,7 @@ public static String getGradleCommand() { String gradleSystemCommand = Arrays.stream(System.getenv("PATH").split(System.getProperty("path.separator"))).map(path -> new File(path, System.getProperty("os.name").toLowerCase().contains("windows") ? "gradle.bat" : "gradle")).filter(File::exists).findFirst().map(File::getAbsolutePath).orElse(null); File gradleWrapper = System.getProperty("os.name").toLowerCase().contains("windows") ? new File(projectRootPom, "gradlew.bat") : new File(projectRootPom, "gradlew"); - return commandExists(gradleWrapper).getKey() ? gradleWrapper.toString() : gradleSystemCommand; + return commandExists(gradleWrapper.getAbsoluteFile()).getKey() ? gradleWrapper.getAbsoluteFile().toString() : gradleSystemCommand; } public static Path tempInitScript; From 5401a5f47886f47ce1f088b96bd53a3a47a359a9 Mon Sep 17 00:00:00 2001 From: Rahul Krishna Date: Tue, 11 Feb 2025 13:18:18 -0500 Subject: [PATCH 2/3] Update gradle.properties --- gradle.properties | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9fd5a78f..ef0464df 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1 @@ -<<<<<<< HEAD version=1.1.1 - -======= -version=1.1.0 ->>>>>>> 9792b653d3b4509e5b74120747e13e69417da994 From 8040e3dd88dccae66c4a002ac91dd91258c33a35 Mon Sep 17 00:00:00 2001 From: Rahul Krishna Date: Tue, 11 Feb 2025 13:18:40 -0500 Subject: [PATCH 3/3] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ef0464df..187fffbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=1.1.1 +version=1.1.2