This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.9.x by this push:
new 3135553e2d [MNG-7806] Plugins verification - remove used in module(s)
report
3135553e2d is described below
commit 3135553e2d53a70c51b6d30b8894579746165ca9
Author: Slawomir Jaranowski <[email protected]>
AuthorDate: Fri Jun 9 15:53:14 2023 +0200
[MNG-7806] Plugins verification - remove used in module(s) report
---
.../internal/DefaultPluginValidationManager.java | 62 ++++++----------------
1 file changed, 15 insertions(+), 47 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
index e72175d03d..632ad89655 100644
---
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
+++
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
@@ -23,7 +23,16 @@ import javax.inject.Singleton;
import java.io.File;
import java.nio.file.Path;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.maven.eventspy.AbstractEventSpy;
@@ -33,7 +42,6 @@ import org.apache.maven.model.InputLocation;
import org.apache.maven.plugin.PluginValidationManager;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.project.MavenProject;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.util.ConfigUtils;
@@ -118,7 +126,7 @@ public final class DefaultPluginValidationManager extends
AbstractEventSpy imple
String pluginKey = pluginKey(pluginArtifact);
PluginValidationIssues pluginIssues =
pluginIssues(session).computeIfAbsent(pluginKey, k -> new
PluginValidationIssues());
- pluginIssues.reportPluginIssue(locality, null, null, issue);
+ pluginIssues.reportPluginIssue(locality, null, issue);
mayReportInline(session, locality, issue);
}
@@ -128,8 +136,7 @@ public final class DefaultPluginValidationManager extends
AbstractEventSpy imple
String pluginKey = pluginKey(mojoDescriptor);
PluginValidationIssues pluginIssues =
pluginIssues(mavenSession.getRepositorySession())
.computeIfAbsent(pluginKey, k -> new PluginValidationIssues());
- pluginIssues.reportPluginIssue(
- locality, pluginDeclaration(mavenSession, mojoDescriptor),
pluginOccurrence(mavenSession), issue);
+ pluginIssues.reportPluginIssue(locality,
pluginDeclaration(mavenSession, mojoDescriptor), issue);
mayReportInline(mavenSession.getRepositorySession(), locality, issue);
}
@@ -144,11 +151,7 @@ public final class DefaultPluginValidationManager extends
AbstractEventSpy imple
PluginValidationIssues pluginIssues =
pluginIssues(mavenSession.getRepositorySession())
.computeIfAbsent(pluginKey, k -> new PluginValidationIssues());
pluginIssues.reportPluginMojoIssue(
- locality,
- pluginDeclaration(mavenSession, mojoDescriptor),
- pluginOccurrence(mavenSession),
- mojoInfo(mojoDescriptor, mojoClass),
- issue);
+ locality, pluginDeclaration(mavenSession, mojoDescriptor),
mojoInfo(mojoDescriptor, mojoClass), issue);
mayReportInline(mavenSession.getRepositorySession(), locality, issue);
}
@@ -182,12 +185,6 @@ public final class DefaultPluginValidationManager extends
AbstractEventSpy imple
logger.warn(" * {}", pluginDeclaration);
}
}
- if (!issues.pluginOccurrences.isEmpty()) {
- logger.warn(" Used in module(s):");
- for (String pluginOccurrence : issues.pluginOccurrences) {
- logger.warn(" * {}", pluginOccurrence);
- }
- }
if (!issues.pluginIssues.isEmpty()) {
for (IssueLocality issueLocality :
issueLocalitiesToReport) {
Set<String> pluginIssues =
issues.pluginIssues.get(issueLocality);
@@ -279,22 +276,6 @@ public final class DefaultPluginValidationManager extends
AbstractEventSpy imple
}
}
- private String pluginOccurrence(MavenSession mavenSession) {
- MavenProject prj = mavenSession.getCurrentProject();
- String result = prj.getGroupId() + ":" + prj.getArtifactId() + ":" +
prj.getVersion();
- File currentPom = prj.getFile();
- if (currentPom != null) {
- Path topLevelBasedir =
- mavenSession.getTopLevelProject().getBasedir().toPath();
- Path current = currentPom.toPath().toAbsolutePath().normalize();
- if (current.startsWith(topLevelBasedir)) {
- current = topLevelBasedir.relativize(current);
- }
- result += " (" + current + ")";
- }
- return result;
- }
-
private String mojoInfo(MojoDescriptor mojoDescriptor, Class<?> mojoClass)
{
return mojoDescriptor.getFullGoalName() + " (" + mojoClass.getName() +
")";
}
@@ -308,44 +289,31 @@ public final class DefaultPluginValidationManager extends
AbstractEventSpy imple
private static class PluginValidationIssues {
private final LinkedHashSet<String> pluginDeclarations;
- private final LinkedHashSet<String> pluginOccurrences;
-
private final HashMap<IssueLocality, LinkedHashSet<String>>
pluginIssues;
private final HashMap<IssueLocality, LinkedHashMap<String,
LinkedHashSet<String>>> mojoIssues;
private PluginValidationIssues() {
this.pluginDeclarations = new LinkedHashSet<>();
- this.pluginOccurrences = new LinkedHashSet<>();
this.pluginIssues = new HashMap<>();
this.mojoIssues = new HashMap<>();
}
private synchronized void reportPluginIssue(
- IssueLocality issueLocality, String pluginDeclaration, String
pluginOccurrence, String issue) {
+ IssueLocality issueLocality, String pluginDeclaration, String
issue) {
if (pluginDeclaration != null) {
pluginDeclarations.add(pluginDeclaration);
}
- if (pluginOccurrence != null) {
- pluginOccurrences.add(pluginOccurrence);
- }
pluginIssues
.computeIfAbsent(issueLocality, k -> new LinkedHashSet<>())
.add(issue);
}
private synchronized void reportPluginMojoIssue(
- IssueLocality issueLocality,
- String pluginDeclaration,
- String pluginOccurrence,
- String mojoInfo,
- String issue) {
+ IssueLocality issueLocality, String pluginDeclaration, String
mojoInfo, String issue) {
if (pluginDeclaration != null) {
pluginDeclarations.add(pluginDeclaration);
}
- if (pluginOccurrence != null) {
- pluginOccurrences.add(pluginOccurrence);
- }
mojoIssues
.computeIfAbsent(issueLocality, k -> new LinkedHashMap<>())
.computeIfAbsent(mojoInfo, k -> new LinkedHashSet<>())
