From e03d86076a76c8b8bb2a08c927a824b65925f918 Mon Sep 17 00:00:00 2001 From: Rahul Krishna Date: Wed, 10 Jul 2024 09:11:19 -0400 Subject: [PATCH 1/3] Rename the .library-depenedencies to _library_dependencies Signed-off-by: Rahul Krishna --- src/main/java/com/ibm/northstar/utils/BuildProject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ibm/northstar/utils/BuildProject.java b/src/main/java/com/ibm/northstar/utils/BuildProject.java index 0b2a3458..b8b959ba 100644 --- a/src/main/java/com/ibm/northstar/utils/BuildProject.java +++ b/src/main/java/com/ibm/northstar/utils/BuildProject.java @@ -14,7 +14,7 @@ public class BuildProject { public static Path libDownloadPath; - private static final String LIB_DEPS_DOWNLOAD_DIR = ".library-dependencies"; + private static final String LIB_DEPS_DOWNLOAD_DIR = "library-dependencies"; private static final String MAVEN_CMD = System.getProperty("os.name").toLowerCase().contains("windows") ? "mvn.cmd" : "mvn"; private static final String GRADLE_CMD = System.getProperty("os.name").toLowerCase().contains("windows") ? "gradlew.bat" : "gradlew"; From 243bd5e436fd14879c74ab449057ead9265fac6b Mon Sep 17 00:00:00 2001 From: Rahul Krishna Date: Wed, 10 Jul 2024 09:14:19 -0400 Subject: [PATCH 2/3] Rename the .library-depenedencies to _library_dependencies --- src/main/java/com/ibm/northstar/utils/BuildProject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ibm/northstar/utils/BuildProject.java b/src/main/java/com/ibm/northstar/utils/BuildProject.java index b8b959ba..08f88705 100644 --- a/src/main/java/com/ibm/northstar/utils/BuildProject.java +++ b/src/main/java/com/ibm/northstar/utils/BuildProject.java @@ -14,7 +14,7 @@ public class BuildProject { public static Path libDownloadPath; - private static final String LIB_DEPS_DOWNLOAD_DIR = "library-dependencies"; + private static final String LIB_DEPS_DOWNLOAD_DIR = "_library_dependencies"; private static final String MAVEN_CMD = System.getProperty("os.name").toLowerCase().contains("windows") ? "mvn.cmd" : "mvn"; private static final String GRADLE_CMD = System.getProperty("os.name").toLowerCase().contains("windows") ? "gradlew.bat" : "gradlew"; From e0c272433d3c935c28817d1dcab5b110bc27a0e5 Mon Sep 17 00:00:00 2001 From: Rahul Krishna Date: Wed, 10 Jul 2024 09:16:17 -0400 Subject: [PATCH 3/3] Rename the .library-depenedencies to _library_dependencies Signed-off-by: Rahul Krishna --- src/main/java/com/ibm/northstar/CodeAnalyzer.java | 2 ++ .../com/ibm/northstar/utils/BuildProject.java | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/main/java/com/ibm/northstar/CodeAnalyzer.java b/src/main/java/com/ibm/northstar/CodeAnalyzer.java index 7d572108..3240fd74 100644 --- a/src/main/java/com/ibm/northstar/CodeAnalyzer.java +++ b/src/main/java/com/ibm/northstar/CodeAnalyzer.java @@ -136,6 +136,8 @@ private static void analyze() throws IOException, ClassHierarchyException, CallG } } + // Cleanup library dependencies directory + BuildProject.cleanLibraryDependencies(); // Convert the JavaCompilationUnit to JSON and add to consolidated json object String symbolTableJSONString = gson.toJson(symbolTable); diff --git a/src/main/java/com/ibm/northstar/utils/BuildProject.java b/src/main/java/com/ibm/northstar/utils/BuildProject.java index 08f88705..2156f926 100644 --- a/src/main/java/com/ibm/northstar/utils/BuildProject.java +++ b/src/main/java/com/ibm/northstar/utils/BuildProject.java @@ -153,4 +153,19 @@ public static boolean downloadLibraryDependencies(String projectPath) { return false; } } + + public void cleanLibraryDependencies() { + if (libDownloadPath != null) { + Log.info("Cleaning up library dependency directory: " + libDownloadPath); + try { + Files.walk(libDownloadPath) + .filter(Files::isRegularFile) + .map(Path::toFile) + .forEach(File::delete); + Files.delete(libDownloadPath); + } catch (IOException e) { + Log.error("Error deleting library dependency directory: " + e.getMessage()); + } + } + } }