Prepare for next qulice-maven-plugin release

yegor256 · May 15, 2024 · 2617985 · 2617985
1 parent 606f2fd
commit 2617985
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/qulice-checkstyle/pom.xml b/qulice-checkstyle/pom.xml
@@ -153,7 +153,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
                 <exclude>dependencies:org.antlr</exclude>
                 <exclude>xml:/src/main/resources/com/qulice/checkstyle/checks.xml</exclude>
                 <exclude>xml:/src/test/resources/com/qulice/checkstyle/ChecksTest/.*</exclude>
-                <exclude>duplicatefinder:</exclude>
               </excludes>
             </configuration>
           </plugin>

diff --git a/qulice-maven-plugin/pom.xml b/qulice-maven-plugin/pom.xml
@@ -71,6 +71,26 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-exec</artifactId>
       <version>1.6.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.aether</groupId>
+          <artifactId>aether-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.aether</groupId>
+          <artifactId>aether-util</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
+      <version>1.9.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-util</artifactId>
+      <version>1.9.8</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.sisu</groupId>
@@ -395,7 +415,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
                 <exclude>pmd:.*/src/it/.*</exclude>
                 <exclude>pmd:.*/src/test/resources/com/qulice/maven/ValidationExclusion/.*</exclude>
                 <exclude>xml:/src/it/.*</exclude>
-                <exclude>duplicatefinder:.*</exclude>
               </excludes>
             </configuration>
           </plugin>

diff --git a/qulice-maven-plugin/src/main/java/com/qulice/maven/DuplicateFinderValidator.java b/qulice-maven-plugin/src/main/java/com/qulice/maven/DuplicateFinderValidator.java
@@ -31,12 +31,10 @@
 package com.qulice.maven;
 
 import com.qulice.spi.ValidationException;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.Properties;
 import java.util.stream.Collectors;
-import org.apache.commons.collections.CollectionUtils;
 
 /**
  * Validate with maven-duplicate-finder-plugin.
@@ -58,12 +56,9 @@ public void validate(final MavenEnvironment env)
             props.put("useResultFile", "false");
             props.put(
                 "ignoredResourcePatterns",
-                CollectionUtils.union(
-                    env.excludes(prefix).stream()
-                        .filter(s -> !s.contains(":"))
-                        .collect(Collectors.toList()),
-                    Arrays.asList("META-INF/.*", "module-info.class")
-                )
+                env.excludes(prefix).stream()
+                    .filter(s -> !s.contains(":"))
+                    .collect(Collectors.toList())
             );
             final Collection<Properties> deps = new LinkedList<>();
             for (final String sdep : env.excludes(prefix)) {