From 7bfdaa807d41ce7fd1c18d23067d00e4f0e1b376 Mon Sep 17 00:00:00 2001 From: Marco <> Date: Wed, 17 Mar 2021 22:01:06 -0600 Subject: [PATCH 1/4] Enable jar extraction to continue when a single file extraction fails --- depclean-core/pom.xml | 4 ++-- depclean-maven-plugin/pom.xml | 6 +++--- .../src/main/java/se/kth/depclean/util/JarUtils.java | 12 +++++++++--- pom.xml | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/depclean-core/pom.xml b/depclean-core/pom.xml index 3c8e6fc4..048a4f4a 100644 --- a/depclean-core/pom.xml +++ b/depclean-core/pom.xml @@ -8,12 +8,12 @@ se.kth.castor depclean-parent-pom - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT depclean-core - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT jar Core library of DepClean depclean-core diff --git a/depclean-maven-plugin/pom.xml b/depclean-maven-plugin/pom.xml index b301fd0b..286eff24 100644 --- a/depclean-maven-plugin/pom.xml +++ b/depclean-maven-plugin/pom.xml @@ -6,12 +6,12 @@ se.kth.castor depclean-parent-pom - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT depclean-maven-plugin - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT maven-plugin depclean-maven-plugin @@ -98,7 +98,7 @@ se.kth.castor depclean-core - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT diff --git a/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java b/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java index 5e382699..0b089eb6 100644 --- a/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java +++ b/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java @@ -51,14 +51,16 @@ public static void decompressJars(final String outputDirectory) { for (File f : Objects.requireNonNull(files.listFiles())) { if (f.getName().endsWith(".jar")) { try { + log.info("Decompressing file: " + f.getName()); JarUtils.decompressJarFile(outputDirectory, f.getAbsolutePath()); // delete the original dependency jar file org.apache.commons.io.FileUtils.forceDelete(f); } catch (IOException e) { - log.warn("Problem decompressing jar file: " + f.getAbsolutePath()); + log.error("Problem decompressing jar file: " + f.getAbsolutePath(), e); } } } + log.info("Jar Decompression phase is completed"); } /** @@ -80,8 +82,12 @@ private static void decompressJarFile(String destDirectory, String jarFilePath) String filePath = destDirectory + File.separator + entry.getName(); if (!entry.isDirectory()) { new File(filePath).getParentFile().mkdirs(); //NOSONAR Triggers a false warning of path traversal attack - // if the entry is a file, extracts it - extractFile(jarIn, filePath); + try { + // if the entry is a file, extracts it + extractFile(jarIn, filePath); + } catch (IOException e) { + log.warn("Could not extract file: " + filePath + " from jar " + jarFilePath); + } } jarIn.closeEntry(); entry = jarIn.getNextJarEntry(); diff --git a/pom.xml b/pom.xml index bbf56691..f4d57571 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ se.kth.castor depclean-parent-pom - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT pom 4.0.0 From f22ad6bc0928ed82db9d12306049ad563c8bd997 Mon Sep 17 00:00:00 2001 From: Marco <> Date: Thu, 18 Mar 2021 12:01:51 -0600 Subject: [PATCH 2/4] Remove extra logging --- depclean-core/pom.xml | 4 ++-- depclean-maven-plugin/pom.xml | 6 +++--- .../src/main/java/se/kth/depclean/util/JarUtils.java | 5 ++--- pom.xml | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/depclean-core/pom.xml b/depclean-core/pom.xml index 048a4f4a..3c8e6fc4 100644 --- a/depclean-core/pom.xml +++ b/depclean-core/pom.xml @@ -8,12 +8,12 @@ se.kth.castor depclean-parent-pom - 2.0.2-SNAPSHOT + 2.0.1-SNAPSHOT depclean-core - 2.0.2-SNAPSHOT + 2.0.1-SNAPSHOT jar Core library of DepClean depclean-core diff --git a/depclean-maven-plugin/pom.xml b/depclean-maven-plugin/pom.xml index 286eff24..b301fd0b 100644 --- a/depclean-maven-plugin/pom.xml +++ b/depclean-maven-plugin/pom.xml @@ -6,12 +6,12 @@ se.kth.castor depclean-parent-pom - 2.0.2-SNAPSHOT + 2.0.1-SNAPSHOT depclean-maven-plugin - 2.0.2-SNAPSHOT + 2.0.1-SNAPSHOT maven-plugin depclean-maven-plugin @@ -98,7 +98,7 @@ se.kth.castor depclean-core - 2.0.2-SNAPSHOT + 2.0.1-SNAPSHOT diff --git a/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java b/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java index 0b089eb6..70feb0e1 100644 --- a/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java +++ b/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java @@ -51,16 +51,15 @@ public static void decompressJars(final String outputDirectory) { for (File f : Objects.requireNonNull(files.listFiles())) { if (f.getName().endsWith(".jar")) { try { - log.info("Decompressing file: " + f.getName()); JarUtils.decompressJarFile(outputDirectory, f.getAbsolutePath()); // delete the original dependency jar file org.apache.commons.io.FileUtils.forceDelete(f); } catch (IOException e) { - log.error("Problem decompressing jar file: " + f.getAbsolutePath(), e); + log.warn("Problem decompressing jar file: " + f.getAbsolutePath(), e); } } } - log.info("Jar Decompression phase is completed"); + log.info("Jar decompression phase is completed"); } /** diff --git a/pom.xml b/pom.xml index f4d57571..bbf56691 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ se.kth.castor depclean-parent-pom - 2.0.2-SNAPSHOT + 2.0.1-SNAPSHOT pom 4.0.0 From 8fd9de031f5008d385a1e9a2fcb486e930d14d17 Mon Sep 17 00:00:00 2001 From: Marco <> Date: Thu, 18 Mar 2021 12:05:53 -0600 Subject: [PATCH 3/4] Remove extra logging --- .../src/main/java/se/kth/depclean/util/JarUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java b/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java index 70feb0e1..ea0703a6 100644 --- a/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java +++ b/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java @@ -55,7 +55,7 @@ public static void decompressJars(final String outputDirectory) { // delete the original dependency jar file org.apache.commons.io.FileUtils.forceDelete(f); } catch (IOException e) { - log.warn("Problem decompressing jar file: " + f.getAbsolutePath(), e); + log.warn("Problem decompressing jar file: " + f.getAbsolutePath()); } } } From 0e389b0b6e7a989ecca0e38850036a8005a68729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Soto=20Valero?= Date: Thu, 18 Mar 2021 21:58:32 +0100 Subject: [PATCH 4/4] Remove log --- .../src/main/java/se/kth/depclean/util/JarUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java b/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java index ea0703a6..3829c75b 100644 --- a/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java +++ b/depclean-maven-plugin/src/main/java/se/kth/depclean/util/JarUtils.java @@ -59,7 +59,6 @@ public static void decompressJars(final String outputDirectory) { } } } - log.info("Jar decompression phase is completed"); } /**