From e1f510d347d72d4fe45ba5e2cf74dbe16ec8ac81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Soto=20Valero?= Date: Wed, 6 Apr 2022 13:17:59 +0200 Subject: [PATCH] Change DepClean version to SNAPSHOT --- depclean-core/pom.xml | 4 ++-- .../core/analysis/ClassFileVisitorUtils.java | 9 +++++---- .../core/analysis/DefaultClassAnalyzer.java | 5 +++-- .../analysis/graph/DefaultCallGraphTest.java | 6 ++++++ .../resources/basic_spring_maven_project/pom.xml | 2 +- depclean-gradle-plugin/build.gradle | 4 ++-- depclean-maven-plugin/pom.xml | 6 +++--- .../kth/depclean/graph/MavenDependencyGraph.java | 5 ++--- .../all_dependencies_unused/pom.xml | 2 +- .../DepCleanMojoIT/all_dependencies_used/pom.xml | 2 +- .../debloated_pom_is_correct/pom.xml | 2 +- .../DepCleanMojoIT/empty_project/pom.xml | 2 +- .../json_should_be_correct/pom.xml | 2 +- .../DepCleanMojoIT/pom_should_be_correct/pom.xml | 2 +- .../DepCleanMojoIT/processor_used/pom.xml | 2 +- .../DepCleanMojoIT/unused_direct_only/pom.xml | 2 +- .../DepCleanMojoIT/unused_inherited_only/pom.xml | 2 +- .../unused_transitive_only/pom.xml | 2 +- .../DepCleanMojoIT/used_indirectly/pom.xml | 2 +- .../DepCleanMojoResources/pom-debloated.xml | 2 +- pom.xml | 16 ++++++++-------- 21 files changed, 44 insertions(+), 37 deletions(-) diff --git a/depclean-core/pom.xml b/depclean-core/pom.xml index fd91596b..d7de61d3 100644 --- a/depclean-core/pom.xml +++ b/depclean-core/pom.xml @@ -8,12 +8,12 @@ se.kth.castor depclean-parent-pom - 2.0.2 + 2.0.3-SNAPSHOT depclean-core - 2.0.2 + 2.0.3-SNAPSHOT jar Core library of DepClean depclean-core diff --git a/depclean-core/src/main/java/se/kth/depclean/core/analysis/ClassFileVisitorUtils.java b/depclean-core/src/main/java/se/kth/depclean/core/analysis/ClassFileVisitorUtils.java index 2e3b789d..025224a1 100644 --- a/depclean-core/src/main/java/se/kth/depclean/core/analysis/ClassFileVisitorUtils.java +++ b/depclean-core/src/main/java/se/kth/depclean/core/analysis/ClassFileVisitorUtils.java @@ -30,11 +30,13 @@ import java.nio.file.Paths; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; +import lombok.extern.slf4j.Slf4j; import org.codehaus.plexus.util.DirectoryScanner; /** * Utility to visit classes in a library given either as a jar file or an exploded directory. */ +@Slf4j public final class ClassFileVisitorUtils { private static final String[] CLASS_INCLUDES = {"**/*.class"}; @@ -92,7 +94,7 @@ private static void acceptJar(URL url, ClassFileVisitor visitor) { } } } catch (IOException e) { - e.printStackTrace(); + log.error("Error analyzing JAR: " + url); } } @@ -112,12 +114,11 @@ private static void acceptDirectory(File directory, ClassFileVisitor visitor) { scanner.scan(); String[] paths = scanner.getIncludedFiles(); for (String path : paths) { - path = path.replace(File.separatorChar, '/'); File file = new File(directory, path); try (FileInputStream in = new FileInputStream(file)) { visitClass(path, in, visitor); } catch (IOException e) { - e.printStackTrace(); + log.error("Error analyzing directory: " + directory.getAbsolutePath()); } } } @@ -151,7 +152,7 @@ private static void visitClass(String path, InputStream in, ClassFileVisitor vis } path = getChild(path); String className = path.substring(0, path.length() - CLASS.length()); - className = className.replace('/', '.'); + className = className.replace(File.separatorChar, '.'); visitor.visitClass(className, in); } diff --git a/depclean-core/src/main/java/se/kth/depclean/core/analysis/DefaultClassAnalyzer.java b/depclean-core/src/main/java/se/kth/depclean/core/analysis/DefaultClassAnalyzer.java index ecbb6a20..4f481a67 100644 --- a/depclean-core/src/main/java/se/kth/depclean/core/analysis/DefaultClassAnalyzer.java +++ b/depclean-core/src/main/java/se/kth/depclean/core/analysis/DefaultClassAnalyzer.java @@ -22,11 +22,12 @@ import java.io.IOException; import java.net.URL; import java.util.Set; -import java.util.zip.ZipException; +import lombok.extern.slf4j.Slf4j; /** * The default class analyzer. */ +@Slf4j public class DefaultClassAnalyzer implements ClassAnalyzer { /** @@ -42,7 +43,7 @@ public Set analyze(URL url) throws IOException { try { ClassFileVisitorUtils.accept(url, visitor); } catch (Exception e) { - e.printStackTrace(); + log.error("Error analyzing class file: " + url); } return visitor.getClasses(); } diff --git a/depclean-core/src/test/java/se/kth/depclean/core/analysis/graph/DefaultCallGraphTest.java b/depclean-core/src/test/java/se/kth/depclean/core/analysis/graph/DefaultCallGraphTest.java index a55c6980..00b71b27 100644 --- a/depclean-core/src/test/java/se/kth/depclean/core/analysis/graph/DefaultCallGraphTest.java +++ b/depclean-core/src/test/java/se/kth/depclean/core/analysis/graph/DefaultCallGraphTest.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -43,4 +44,9 @@ void getUsagesPerClass() { usagesExpected.put("I", new HashSet<>(Arrays.asList("J"))); Assertions.assertEquals(usagesExpected, usagesPerClass); } + + @AfterEach + void tearDown() { + DefaultCallGraph.clear(); + } } \ No newline at end of file diff --git a/depclean-core/src/test/resources/basic_spring_maven_project/pom.xml b/depclean-core/src/test/resources/basic_spring_maven_project/pom.xml index 0d1d9a07..497e28f7 100644 --- a/depclean-core/src/test/resources/basic_spring_maven_project/pom.xml +++ b/depclean-core/src/test/resources/basic_spring_maven_project/pom.xml @@ -43,7 +43,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-gradle-plugin/build.gradle b/depclean-gradle-plugin/build.gradle index 5e65ef73..c312c24b 100644 --- a/depclean-gradle-plugin/build.gradle +++ b/depclean-gradle-plugin/build.gradle @@ -22,8 +22,8 @@ repositories { dependencies { implementation(gradleApi()) implementation(gradleTestKit()) - implementation('se.kth.castor:depclean-core:2.0.2') - implementation('se.kth.castor:depclean-maven-plugin:2.0.2') + implementation('se.kth.castor:depclean-core:2.0.3-SNAPSHOT') + implementation('se.kth.castor:depclean-maven-plugin:2.0.3-SNAPSHOT') implementation('org.slf4j:slf4j-log4j12:1.7.30') compileOnly('org.projectlombok:lombok:1.18.22') annotationProcessor 'org.projectlombok:lombok:1.18.22' diff --git a/depclean-maven-plugin/pom.xml b/depclean-maven-plugin/pom.xml index dcbc7816..e40101aa 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 + 2.0.3-SNAPSHOT depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT maven-plugin depclean-maven-plugin @@ -33,7 +33,7 @@ se.kth.castor depclean-core - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-maven-plugin/src/main/java/se/kth/depclean/graph/MavenDependencyGraph.java b/depclean-maven-plugin/src/main/java/se/kth/depclean/graph/MavenDependencyGraph.java index c1663ca3..388f144e 100644 --- a/depclean-maven-plugin/src/main/java/se/kth/depclean/graph/MavenDependencyGraph.java +++ b/depclean-maven-plugin/src/main/java/se/kth/depclean/graph/MavenDependencyGraph.java @@ -31,13 +31,12 @@ public class MavenDependencyGraph implements DependencyGraph { private final Set directDependencies; private final Set inheritedDependencies; private final Set transitiveDependencies; - private final Multimap dependenciesPerDependency - = ArrayListMultimap.create(); + private final Multimap dependenciesPerDependency = ArrayListMultimap.create(); /** * Create a maven dependency graph. * - * @param project the maven project + * @param project the maven project * @param rootNode the graph's root node */ public MavenDependencyGraph(MavenProject project, Model model, DependencyNode rootNode) { diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_unused/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_unused/pom.xml index e55dc79d..78cff8c5 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_unused/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_unused/pom.xml @@ -53,7 +53,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_used/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_used/pom.xml index 4c9761fc..e253a28c 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_used/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_used/pom.xml @@ -58,7 +58,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/debloated_pom_is_correct/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/debloated_pom_is_correct/pom.xml index 9a221dbe..d22c723d 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/debloated_pom_is_correct/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/debloated_pom_is_correct/pom.xml @@ -71,7 +71,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/empty_project/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/empty_project/pom.xml index 4d7ae3c7..60f74e2e 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/empty_project/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/empty_project/pom.xml @@ -21,7 +21,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/json_should_be_correct/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/json_should_be_correct/pom.xml index 9543db26..454539f9 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/json_should_be_correct/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/json_should_be_correct/pom.xml @@ -45,7 +45,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/pom_should_be_correct/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/pom_should_be_correct/pom.xml index 4d7ae3c7..60f74e2e 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/pom_should_be_correct/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/pom_should_be_correct/pom.xml @@ -21,7 +21,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/processor_used/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/processor_used/pom.xml index 3ec0531e..785aa850 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/processor_used/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/processor_used/pom.xml @@ -72,7 +72,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_direct_only/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_direct_only/pom.xml index 97dc044d..2a69ec7c 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_direct_only/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_direct_only/pom.xml @@ -43,7 +43,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_only/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_only/pom.xml index 2fc02360..902a8390 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_only/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_only/pom.xml @@ -43,7 +43,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_transitive_only/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_transitive_only/pom.xml index 2fc02360..902a8390 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_transitive_only/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_transitive_only/pom.xml @@ -43,7 +43,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/used_indirectly/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/used_indirectly/pom.xml index daf66f1e..2a63befa 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/used_indirectly/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/used_indirectly/pom.xml @@ -48,7 +48,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/depclean-maven-plugin/src/test/resources/DepCleanMojoResources/pom-debloated.xml b/depclean-maven-plugin/src/test/resources/DepCleanMojoResources/pom-debloated.xml index 177a6c91..fbd4da43 100644 --- a/depclean-maven-plugin/src/test/resources/DepCleanMojoResources/pom-debloated.xml +++ b/depclean-maven-plugin/src/test/resources/DepCleanMojoResources/pom-debloated.xml @@ -67,7 +67,7 @@ se.kth.castor depclean-maven-plugin - 2.0.2 + 2.0.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index a88db7b5..1909df82 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ se.kth.castor depclean-parent-pom - 2.0.2 + 2.0.3-SNAPSHOT pom 4.0.0 @@ -231,16 +231,16 @@ org.apache.maven.plugins maven-compiler-plugin - ${compiler.plugin.version} + 3.10.1 - 8 + 17 org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.2.0 attach-sources @@ -254,7 +254,7 @@ org.apache.maven.plugins maven-javadoc-plugin - ${javadoc.plugin.version} + 3.3.2 ${javadoc.source} none @@ -272,7 +272,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 3.0.1 sign-artifacts @@ -287,7 +287,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.9 true ossrh @@ -300,7 +300,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.0.0-M5 true false