Merge pull request #151 from castor-software/issue_150

Roll back release to Java 11
ASSERT-KTH · Jan 1, 2023 · 092a28d · 092a28d
2 parents eea5147 + 798ceb6
commit 092a28d
Show file tree

Hide file tree

Showing 17 changed files with 39 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.4</version>
+    <version>2.0.5</version>
   </parent>
 
   <!-- Coordinates -->
   <artifactId>depclean-core</artifactId>
-  <version>2.0.4</version>
+  <version>2.0.5</version>
   <packaging>jar</packaging>
   <description>Core library of DepClean</description>
   <name>depclean-core</name>
@@ -88,13 +88,13 @@
     <dependency>
       <groupId>com.thoughtworks.qdox</groupId>
       <artifactId>qdox</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.3</version>
     </dependency>
     <!-- Bytecode manipulation -->
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>9.3</version>
+      <version>9.4</version>
     </dependency>
     <!-- Maven dependencies -->
     <dependency>
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.4.2</version>
+      <version>3.5.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -124,7 +124,7 @@
     <dependency>
       <groupId>org.jetbrains</groupId>
       <artifactId>annotations</artifactId>
-      <version>17.0.0</version>
+      <version>23.1.0</version>
       <scope>compile</scope>
     </dependency>
     <!-- Utils -->

diff --git a/depclean-core/src/main/java/se/kth/depclean/core/AbstractDebloater.java b/depclean-core/src/main/java/se/kth/depclean/core/AbstractDebloater.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import se.kth.depclean.core.analysis.model.DebloatedDependency;
@@ -25,7 +26,7 @@ public void write() throws IOException {
     setDependencies(
         analysis.getUsedDependencies().stream()
             .map(this::toProviderDependency)
-            .toList()
+            .collect(Collectors.toList())
     );
     logDependencies();
     postProcessDependencies();

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.4</version>
+    <version>2.0.5</version>
   </parent>
 
   <!-- Coordinates -->
   <artifactId>depclean-maven-plugin</artifactId>
-  <version>2.0.4</version>
+  <version>2.0.5</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.4</version>
+      <version>2.0.5</version>
     </dependency>
     <!--Maven tools for plugin construction-->
     <dependency>
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-dependency-tree</artifactId>
-      <version>3.2.0</version>
+      <version>3.2.1</version>
     </dependency>
     <!-- Utils -->
     <dependency>
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.9.0</version>
+      <version>2.10</version>
     </dependency>
     <dependency>
       <groupId>org.whitesource</groupId>
@@ -91,25 +91,25 @@
     <dependency>
       <groupId>com.soebes.itf.jupiter.extension</groupId>
       <artifactId>itf-extension-maven</artifactId>
-      <version>0.9.0</version>
+      <version>0.11.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.soebes.itf.jupiter.extension</groupId>
       <artifactId>itf-assertj</artifactId>
-      <version>0.9.0</version>
+      <version>0.11.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.soebes.itf.jupiter.extension</groupId>
       <artifactId>itf-jupiter-extension</artifactId>
-      <version>0.9.0</version>
+      <version>0.11.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.19.0</version>
+      <version>3.23.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

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
@@ -167,7 +167,7 @@ private Dependency toDepCleanDependency(Artifact artifact) {
     return new Dependency(
         artifact.getGroupId(),
         artifact.getArtifactId(),
-        artifact.getBaseVersion(),
+        artifact.getVersion(),
         artifact.getScope(),
         artifact.getFile()
     );

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.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</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
@@ -80,7 +80,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</version>
         <executions>
           <execution>
             <goals>

diff --git a/...gin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_exists/pom.xml b/...gin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_exists/pom.xml
@@ -55,7 +55,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</version>
         <executions>
           <execution>
             <goals>

diff --git a/...ven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/used_java_record/pom.xml b/...ven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/used_java_record/pom.xml
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</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
@@ -80,7 +80,7 @@
       <plugin>
         <groupId>se.kth.castor</groupId>
         <artifactId>depclean-maven-plugin</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</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.4</version>
+  <version>2.0.5</version>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
 
@@ -18,17 +18,18 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- plugins -->
-    <compiler.release>17</compiler.release>
-    <javadoc.source>17</javadoc.source>
+    <compiler.release>11</compiler.release>
+    <javadoc.source>11</javadoc.source>
     <javadoc.plugin.version>3.2.0</javadoc.plugin.version>
     <jacoco.plugin.version>0.8.8</jacoco.plugin.version>
     <coveralls.plugin.version>4.3.0</coveralls.plugin.version>
     <surefire.plugin.version>3.0.0-M3</surefire.plugin.version>
     <compiler.plugin.version>3.10.1</compiler.plugin.version>
     <!-- dependencies -->
-    <lombok.version>1.18.22</lombok.version>
-    <slf4j-api.version>2.0.0-alpha1</slf4j-api.version>
-    <slf4j-log4j12.version>1.8.0-beta4</slf4j-log4j12.version>
+    <lombok.version>1.18.24</lombok.version>
+    <slf4j-api.version>2.0.5</slf4j-api.version>
+    <slf4j-log4j12.version>2.0.5</slf4j-log4j12.version>
+    <!-- do not change -->
     <junit5.version>5.6.2</junit5.version>
   </properties>
 
@@ -172,7 +173,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${compiler.plugin.version}</version>
         <configuration>
-          <release>17</release>
+          <release>11</release>
         </configuration>
       </plugin>
       <!-- Maven site -->
@@ -233,7 +234,7 @@
             <artifactId>maven-compiler-plugin</artifactId>
             <version>3.10.1</version>
             <configuration>
-              <release>17</release>
+              <release>11</release>
             </configuration>
           </plugin>
           <!-- Maven source plugin -->