Change DepClean version to SNAPSHOT

ASSERT-KTH · Apr 6, 2022 · e1f510d · e1f510d
1 parent 1c96de9
commit e1f510d
Show file tree

Hide file tree

Showing 21 changed files with 44 additions and 37 deletions.
diff --git a/depclean-core/pom.xml b/depclean-core/pom.xml
@@ -8,12 +8,12 @@
   <parent>
     <groupId>se.kth.castor</groupId>
     <artifactId>depclean-parent-pom</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <!-- Coordinates -->
   <artifactId>depclean-core</artifactId>
-  <version>2.0.2</version>
+  <version>2.0.3-SNAPSHOT</version>
   <packaging>jar</packaging>
   <description>Core library of DepClean</description>
   <name>depclean-core</name>

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
@@ -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
@@ -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<String> 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
@@ -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();
+  }
 }
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
@@ -43,7 +43,7 @@
         <!-- see https://github.com/castor-software/depclean -->
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git 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
@@ -6,12 +6,12 @@
   <parent>
     <groupId>se.kth.castor</groupId>
     <artifactId>depclean-parent-pom</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3-SNAPSHOT</version>
   </parent>
 
   <!-- Coordinates -->
   <artifactId>depclean-maven-plugin</artifactId>
-  <version>2.0.2</version>
+  <version>2.0.3-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>depclean-maven-plugin</name>
 
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>se.kth.castor</groupId>
       <artifactId>depclean-core</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.3-SNAPSHOT</version>
     </dependency>
     <!--Maven tools for plugin construction-->
     <dependency>

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
@@ -31,13 +31,12 @@ public class MavenDependencyGraph implements DependencyGraph {
   private final Set<Dependency> directDependencies;
   private final Set<Dependency> inheritedDependencies;
   private final Set<Dependency> transitiveDependencies;
-  private final Multimap<Dependency, Dependency> dependenciesPerDependency
-      = ArrayListMultimap.create();
+  private final Multimap<Dependency, Dependency> 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/...gin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_unused/pom.xml b/...gin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_unused/pom.xml
@@ -53,7 +53,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git a/...lugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_used/pom.xml b/...lugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/all_dependencies_used/pom.xml
@@ -58,7 +58,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git a/...in/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/debloated_pom_is_correct/pom.xml b/...in/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/debloated_pom_is_correct/pom.xml
@@ -71,7 +71,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git a/...-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/empty_project/pom.xml b/...-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/empty_project/pom.xml
@@ -21,7 +21,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git a/...ugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/json_should_be_correct/pom.xml b/...ugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/json_should_be_correct/pom.xml
@@ -45,7 +45,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git a/...lugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/pom_should_be_correct/pom.xml b/...lugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/pom_should_be_correct/pom.xml
@@ -21,7 +21,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git a/...maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/processor_used/pom.xml b/...maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/processor_used/pom.xml
@@ -72,7 +72,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git a/...n-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_direct_only/pom.xml b/...n-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_direct_only/pom.xml
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git a/...lugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_only/pom.xml b/...lugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_only/pom.xml
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git a/...ugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_transitive_only/pom.xml b/...ugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_transitive_only/pom.xml
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git a/...aven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/used_indirectly/pom.xml b/...aven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/used_indirectly/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git 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 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <!-- Coordinates -->
   <groupId>se.kth.castor</groupId>
   <artifactId>depclean-parent-pom</artifactId>
-  <version>2.0.2</version>
+  <version>2.0.3-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
 
@@ -231,16 +231,16 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>${compiler.plugin.version}</version>
+            <version>3.10.1</version>
             <configuration>
-              <release>8</release>
+              <release>17</release>
             </configuration>
           </plugin>
           <!-- Maven source plugin -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.0.1</version>
+            <version>3.2.0</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -254,7 +254,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>${javadoc.plugin.version}</version>
+            <version>3.3.2</version>
             <configuration>
               <source>${javadoc.source}</source>
               <doclint>none</doclint>
@@ -272,7 +272,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.5</version>
+            <version>3.0.1</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
@@ -287,7 +287,7 @@
           <plugin>
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.7</version>
+            <version>1.6.9</version>
             <extensions>true</extensions>
             <configuration>
               <serverId>ossrh</serverId>
@@ -300,7 +300,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-release-plugin</artifactId>
-            <version>2.5.3</version>
+            <version>3.0.0-M5</version>
             <configuration>
               <autoVersionSubmodules>true</autoVersionSubmodules>
               <useReleaseProfile>false</useReleaseProfile>