Skip to content

Remove excessive excludes for duplicate finder #1261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+26 −15
Open

Remove excessive excludes for duplicate finder #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d4e74f
Prepare for next qulice-maven-plugin release
MikailBag Apr 28, 2024
c601919
Fix some more problems
MikailBag May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion qulice-checkstyle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
29 changes: 23 additions & 6 deletions qulice-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -133,11 +153,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
<artifactId>commons-io</artifactId>
<!-- version from parent -->
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<!-- version from parent -->
</dependency>
<dependency>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-log</artifactId>
Expand Down Expand Up @@ -395,7 +410,9 @@ 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>
<exclude>duplicatefinder:about.html</exclude>
<exclude>dependencies:org.apache.maven.resolver:maven-resolver-api</exclude>
<exclude>dependencies:org.apache.maven.resolver:maven-resolver-util</exclude>
</excludes>
</configuration>
</plugin>
Expand Down
11 changes: 3 additions & 8 deletions qulice-maven-plugin/src/main/java/com/qulice/maven/DuplicateFinderValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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)) {
Expand Down