File tree Expand file tree Collapse file tree 3 files changed +23
-10
lines changed
src/main/java/com/qulice/maven Expand file tree Collapse file tree 3 files changed +23
-10
lines changed Original file line number Diff line number Diff line change @@ -153,7 +153,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
153153 <exclude >dependencies:org.antlr</exclude >
154154 <exclude >xml:/src/main/resources/com/qulice/checkstyle/checks.xml</exclude >
155155 <exclude >xml:/src/test/resources/com/qulice/checkstyle/ChecksTest/.*</exclude >
156- <exclude >duplicatefinder:</exclude >
157156 </excludes >
158157 </configuration >
159158 </plugin >
Original file line number Diff line number Diff line change @@ -71,6 +71,26 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
7171 <groupId >org.apache.maven.reporting</groupId >
7272 <artifactId >maven-reporting-exec</artifactId >
7373 <version >1.6.0</version >
74+ <exclusions >
75+ <exclusion >
76+ <groupId >org.eclipse.aether</groupId >
77+ <artifactId >aether-api</artifactId >
78+ </exclusion >
79+ <exclusion >
80+ <groupId >org.eclipse.aether</groupId >
81+ <artifactId >aether-util</artifactId >
82+ </exclusion >
83+ </exclusions >
84+ </dependency >
85+ <dependency >
86+ <groupId >org.apache.maven.resolver</groupId >
87+ <artifactId >maven-resolver-api</artifactId >
88+ <version >1.9.8</version >
89+ </dependency >
90+ <dependency >
91+ <groupId >org.apache.maven.resolver</groupId >
92+ <artifactId >maven-resolver-util</artifactId >
93+ <version >1.9.8</version >
7494 </dependency >
7595 <dependency >
7696 <groupId >org.eclipse.sisu</groupId >
@@ -395,7 +415,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
395415 <exclude >pmd:.*/src/it/.*</exclude >
396416 <exclude >pmd:.*/src/test/resources/com/qulice/maven/ValidationExclusion/.*</exclude >
397417 <exclude >xml:/src/it/.*</exclude >
398- <exclude >duplicatefinder:.*</exclude >
399418 </excludes >
400419 </configuration >
401420 </plugin >
Original file line number Diff line number Diff line change 3131package com .qulice .maven ;
3232
3333import com .qulice .spi .ValidationException ;
34- import java .util .Arrays ;
3534import java .util .Collection ;
3635import java .util .LinkedList ;
3736import java .util .Properties ;
3837import java .util .stream .Collectors ;
39- import org .apache .commons .collections .CollectionUtils ;
4038
4139/**
4240 * Validate with maven-duplicate-finder-plugin.
@@ -58,12 +56,9 @@ public void validate(final MavenEnvironment env)
5856 props .put ("useResultFile" , "false" );
5957 props .put (
6058 "ignoredResourcePatterns" ,
61- CollectionUtils .union (
62- env .excludes (prefix ).stream ()
63- .filter (s -> !s .contains (":" ))
64- .collect (Collectors .toList ()),
65- Arrays .asList ("META-INF/.*" , "module-info.class" )
66- )
59+ env .excludes (prefix ).stream ()
60+ .filter (s -> !s .contains (":" ))
61+ .collect (Collectors .toList ())
6762 );
6863 final Collection <Properties > deps = new LinkedList <>();
6964 for (final String sdep : env .excludes (prefix )) {
You can’t perform that action at this time.
0 commit comments