diff --git a/qulice-checkstyle/pom.xml b/qulice-checkstyle/pom.xml index 03c9abd88..944da2633 100644 --- a/qulice-checkstyle/pom.xml +++ b/qulice-checkstyle/pom.xml @@ -153,7 +153,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE. dependencies:org.antlr xml:/src/main/resources/com/qulice/checkstyle/checks.xml xml:/src/test/resources/com/qulice/checkstyle/ChecksTest/.* - duplicatefinder: diff --git a/qulice-maven-plugin/pom.xml b/qulice-maven-plugin/pom.xml index b901b988b..f79ca80d5 100644 --- a/qulice-maven-plugin/pom.xml +++ b/qulice-maven-plugin/pom.xml @@ -71,6 +71,26 @@ OF THE POSSIBILITY OF SUCH DAMAGE. org.apache.maven.reporting maven-reporting-exec 1.6.0 + + + org.eclipse.aether + aether-api + + + org.eclipse.aether + aether-util + + + + + org.apache.maven.resolver + maven-resolver-api + 1.9.8 + + + org.apache.maven.resolver + maven-resolver-util + 1.9.8 org.eclipse.sisu @@ -395,7 +415,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE. pmd:.*/src/it/.* pmd:.*/src/test/resources/com/qulice/maven/ValidationExclusion/.* xml:/src/it/.* - duplicatefinder:.* 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 index ee8f88926..6b9bd8d14 100644 --- 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 deps = new LinkedList<>(); for (final String sdep : env.excludes(prefix)) {