diff --git a/depclean-core/pom.xml b/depclean-core/pom.xml index 7851239d..8c8da386 100644 --- a/depclean-core/pom.xml +++ b/depclean-core/pom.xml @@ -8,12 +8,12 @@ se.kth.castor depclean-parent-pom - 2.0.4 + 2.0.5 depclean-core - 2.0.4 + 2.0.5 jar Core library of DepClean depclean-core @@ -88,13 +88,13 @@ com.thoughtworks.qdox qdox - 2.0.2 + 2.0.3 org.ow2.asm asm - 9.3 + 9.4 @@ -106,7 +106,7 @@ org.codehaus.plexus plexus-utils - 3.4.2 + 3.5.0 compile @@ -124,7 +124,7 @@ org.jetbrains annotations - 17.0.0 + 23.1.0 compile 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 index 08f7559d..ee40501b 100644 --- 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 index b8d09b98..be3c7f35 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.4 + 2.0.5 depclean-maven-plugin - 2.0.4 + 2.0.5 maven-plugin depclean-maven-plugin @@ -33,7 +33,7 @@ se.kth.castor depclean-core - 2.0.4 + 2.0.5 @@ -62,7 +62,7 @@ org.apache.maven.shared maven-dependency-tree - 3.2.0 + 3.2.1 @@ -73,7 +73,7 @@ com.google.code.gson gson - 2.9.0 + 2.10 org.whitesource @@ -91,25 +91,25 @@ com.soebes.itf.jupiter.extension itf-extension-maven - 0.9.0 + 0.11.0 test com.soebes.itf.jupiter.extension itf-assertj - 0.9.0 + 0.11.0 test com.soebes.itf.jupiter.extension itf-jupiter-extension - 0.9.0 + 0.11.0 test org.assertj assertj-core - 3.19.0 + 3.23.1 test 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 fac06ebe..bc089385 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 @@ -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/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 40362610..b8873610 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.4 + 2.0.5 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 c8827216..c263b40f 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.4 + 2.0.5 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 75b6bc1b..7e3b2891 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 @@ -80,7 +80,7 @@ se.kth.castor depclean-maven-plugin - 2.0.4 + 2.0.5 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 d96afa0a..62e75d2c 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.4 + 2.0.5 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 3d271a0d..1d04ca5b 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.4 + 2.0.5 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 ee82d7a8..8d443be5 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.4 + 2.0.5 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 8fd2e1da..ec4938f4 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.4 + 2.0.5 diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_exists/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_exists/pom.xml index 2dc061dc..9d6fc71f 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_exists/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/unused_inherited_exists/pom.xml @@ -55,7 +55,7 @@ se.kth.castor depclean-maven-plugin - 2.0.4 + 2.0.5 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 9041a1d4..1e01ad83 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.4 + 2.0.5 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 725427d3..a887d25a 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.4 + 2.0.5 diff --git a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/used_java_record/pom.xml b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/used_java_record/pom.xml index 79b2ca78..e777da48 100644 --- a/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/used_java_record/pom.xml +++ b/depclean-maven-plugin/src/test/resources-its/se/kth/depclean/DepCleanMojoIT/used_java_record/pom.xml @@ -49,7 +49,7 @@ se.kth.castor depclean-maven-plugin - 2.0.4 + 2.0.5 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 d8e8bb72..06ec16d3 100644 --- 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 @@ se.kth.castor depclean-maven-plugin - 2.0.4 + 2.0.5 diff --git a/pom.xml b/pom.xml index 72c55783..eea8bd53 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ se.kth.castor depclean-parent-pom - 2.0.4 + 2.0.5 pom 4.0.0 @@ -18,17 +18,18 @@ UTF-8 UTF-8 - 17 - 17 + 11 + 11 3.2.0 0.8.8 4.3.0 3.0.0-M3 3.10.1 - 1.18.22 - 2.0.0-alpha1 - 1.8.0-beta4 + 1.18.24 + 2.0.5 + 2.0.5 + 5.6.2 @@ -172,7 +173,7 @@ maven-compiler-plugin ${compiler.plugin.version} - 17 + 11 @@ -233,7 +234,7 @@ maven-compiler-plugin 3.10.1 - 17 + 11