You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/03/10 17:54:26 UTC
[maven-help-plugin] branch MPH-198 updated (23c4288 -> 794780a)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MPH-198
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git
discard 23c4288 [MPH-198] Get rid of maven-reporting-exec
new 794780a [MPH-198] Get rid of maven-reporting-exec
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (23c4288)
\
N -- N -- N refs/heads/MPH-198 (794780a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-help-plugin] 01/01: [MPH-198] Get rid of maven-reporting-exec
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MPH-198
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git
commit 794780a35d7d28eb64b018d836a2c1c18a48e388
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Fri Mar 10 18:48:39 2023 +0100
[MPH-198] Get rid of maven-reporting-exec
---
pom.xml | 10 ++----
.../apache/maven/plugins/help/DescribeMojo.java | 7 ++--
.../maven/plugins/help/DescribeMojoTest.java | 38 +++++++++++++++-------
3 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index b68c831..026a840 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,15 +140,11 @@
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>3.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-exec</artifactId>
- <version>1.6.0</version>
<exclusions>
+ <!-- we only need one interface MavenReport -->
<exclusion>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings-builder</artifactId>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java b/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
index 516961e..dc3cbe3 100644
--- a/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
@@ -38,6 +38,7 @@ import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
import org.apache.maven.lifecycle.mapping.LifecycleMapping;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.maven.plugin.MavenPluginManager;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@@ -54,7 +55,6 @@ import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.reporting.MavenReport;
-import org.apache.maven.reporting.exec.MavenPluginManagerHelper;
import org.apache.maven.shared.utils.logging.MessageUtils;
import org.apache.maven.tools.plugin.generator.GeneratorUtils;
import org.apache.maven.tools.plugin.util.PluginUtils;
@@ -100,7 +100,7 @@ public class DescribeMojo extends AbstractHelpMojo {
* Component used to get a plugin descriptor from a given plugin.
*/
@Component
- private MavenPluginManagerHelper pluginManager;
+ protected MavenPluginManager pluginManager;
/**
* Component used to get a plugin by its prefix and get mojo descriptors.
@@ -310,7 +310,8 @@ public class DescribeMojo extends AbstractHelpMojo {
}
try {
- return pluginManager.getPluginDescriptor(forLookup, session);
+ return pluginManager.getPluginDescriptor(
+ forLookup, project.getRemotePluginRepositories(), session.getRepositorySession());
} catch (Exception e) {
throw new MojoExecutionException(
"Error retrieving plugin descriptor for:" + LS + LS + "groupId: '"
diff --git a/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java b/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java
index 0d2c140..ce210f1 100644
--- a/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java
@@ -19,10 +19,12 @@
package org.apache.maven.plugins.help;
import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
import org.apache.maven.model.Plugin;
+import org.apache.maven.plugin.MavenPluginManager;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
@@ -31,7 +33,7 @@ import org.apache.maven.plugin.version.PluginVersionResolver;
import org.apache.maven.plugin.version.PluginVersionResult;
import org.apache.maven.plugins.help.DescribeMojo.PluginInfo;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.reporting.exec.MavenPluginManagerHelper;
+import org.eclipse.aether.RepositorySystemSession;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
@@ -196,14 +198,19 @@ public class DescribeMojoTest {
MojoDescriptorCreator mojoDescriptorCreator = mock(MojoDescriptorCreator.class);
PluginVersionResolver pluginVersionResolver = mock(PluginVersionResolver.class);
- MavenPluginManagerHelper pluginManager = mock(MavenPluginManagerHelper.class);
+ MavenPluginManager pluginManager = mock(MavenPluginManager.class);
MavenSession session = mock(MavenSession.class);
+ when(session.getRepositorySession()).thenReturn(mock(RepositorySystemSession.class));
writeDeclaredField(mojo, "mojoDescriptorCreator", mojoDescriptorCreator, true);
writeDeclaredField(mojo, "pluginVersionResolver", pluginVersionResolver, true);
writeDeclaredField(mojo, "pluginManager", pluginManager, true);
writeField(mojo, "session", session, true);
+ MavenProject mavenProject = new MavenProject();
+ mavenProject.setPluginArtifactRepositories(Collections.emptyList());
+ writeField(mojo, "project", mavenProject, true);
when(mojoDescriptorCreator.findPluginForPrefix("help", session)).thenReturn(plugin);
- when(pluginManager.getPluginDescriptor(any(Plugin.class), eq(session))).thenReturn(pd);
+ when(pluginManager.getPluginDescriptor(any(Plugin.class), anyList(), any()))
+ .thenReturn(pd);
PluginDescriptor returned = (PluginDescriptor) invokeMethod(mojo, true, "lookupPluginDescriptor", pi);
@@ -212,7 +219,7 @@ public class DescribeMojoTest {
verify(mojoDescriptorCreator).findPluginForPrefix("help", session);
verify(pluginVersionResolver, never()).resolve(any(PluginVersionRequest.class));
ArgumentCaptor<Plugin> argument = ArgumentCaptor.forClass(Plugin.class);
- verify(pluginManager).getPluginDescriptor(argument.capture(), eq(session));
+ verify(pluginManager).getPluginDescriptor(argument.capture(), anyList(), any());
Plugin capturedPlugin = argument.getValue();
assertEquals("org.test", capturedPlugin.getGroupId());
assertEquals("test", capturedPlugin.getArtifactId());
@@ -234,18 +241,22 @@ public class DescribeMojoTest {
MojoDescriptorCreator mojoDescriptorCreator = mock(MojoDescriptorCreator.class);
PluginVersionResolver pluginVersionResolver = mock(PluginVersionResolver.class);
- MavenPluginManagerHelper pluginManager = mock(MavenPluginManagerHelper.class);
+ MavenPluginManager pluginManager = mock(MavenPluginManager.class);
PluginVersionResult versionResult = mock(PluginVersionResult.class);
MavenSession session = mock(MavenSession.class);
+ when(session.getRepositorySession()).thenReturn(mock(RepositorySystemSession.class));
writeDeclaredField(mojo, "mojoDescriptorCreator", mojoDescriptorCreator, true);
writeDeclaredField(mojo, "pluginVersionResolver", pluginVersionResolver, true);
writeDeclaredField(mojo, "pluginManager", pluginManager, true);
writeField(mojo, "session", session, true);
- writeField(mojo, "project", new MavenProject(), true);
+ MavenProject mavenProject = new MavenProject();
+ mavenProject.setPluginArtifactRepositories(Collections.emptyList());
+ writeField(mojo, "project", mavenProject, true);
when(mojoDescriptorCreator.findPluginForPrefix("help", session)).thenReturn(plugin);
when(pluginVersionResolver.resolve(any(PluginVersionRequest.class))).thenReturn(versionResult);
when(versionResult.getVersion()).thenReturn("1.0");
- when(pluginManager.getPluginDescriptor(any(Plugin.class), eq(session))).thenReturn(pd);
+ when(pluginManager.getPluginDescriptor(any(Plugin.class), anyList(), any()))
+ .thenReturn(pd);
PluginDescriptor returned = (PluginDescriptor) invokeMethod(mojo, true, "lookupPluginDescriptor", pi);
assertEquals(pd, returned);
@@ -256,7 +267,7 @@ public class DescribeMojoTest {
assertEquals("org.test", versionArgument.getValue().getGroupId());
assertEquals("test", versionArgument.getValue().getArtifactId());
ArgumentCaptor<Plugin> argument = ArgumentCaptor.forClass(Plugin.class);
- verify(pluginManager).getPluginDescriptor(argument.capture(), eq(session));
+ verify(pluginManager).getPluginDescriptor(argument.capture(), anyList(), any());
Plugin capturedPlugin = argument.getValue();
assertEquals("org.test", capturedPlugin.getGroupId());
assertEquals("test", capturedPlugin.getArtifactId());
@@ -276,13 +287,18 @@ public class DescribeMojoTest {
MojoDescriptorCreator mojoDescriptorCreator = mock(MojoDescriptorCreator.class);
PluginVersionResolver pluginVersionResolver = mock(PluginVersionResolver.class);
- MavenPluginManagerHelper pluginManager = mock(MavenPluginManagerHelper.class);
+ MavenPluginManager pluginManager = mock(MavenPluginManager.class);
MavenSession session = mock(MavenSession.class);
+ when(session.getRepositorySession()).thenReturn(mock(RepositorySystemSession.class));
writeDeclaredField(mojo, "mojoDescriptorCreator", mojoDescriptorCreator, true);
writeDeclaredField(mojo, "pluginVersionResolver", pluginVersionResolver, true);
writeDeclaredField(mojo, "pluginManager", pluginManager, true);
writeField(mojo, "session", session, true);
- when(pluginManager.getPluginDescriptor(any(Plugin.class), eq(session))).thenReturn(pd);
+ MavenProject mavenProject = new MavenProject();
+ mavenProject.setPluginArtifactRepositories(Collections.emptyList());
+ writeField(mojo, "project", mavenProject, true);
+ when(pluginManager.getPluginDescriptor(any(Plugin.class), anyList(), any()))
+ .thenReturn(pd);
PluginDescriptor returned = (PluginDescriptor) invokeMethod(mojo, true, "lookupPluginDescriptor", pi);
@@ -291,7 +307,7 @@ public class DescribeMojoTest {
verify(mojoDescriptorCreator, never()).findPluginForPrefix(any(String.class), any(MavenSession.class));
verify(pluginVersionResolver, never()).resolve(any(PluginVersionRequest.class));
ArgumentCaptor<Plugin> argument = ArgumentCaptor.forClass(Plugin.class);
- verify(pluginManager).getPluginDescriptor(argument.capture(), eq(session));
+ verify(pluginManager).getPluginDescriptor(argument.capture(), anyList(), any());
Plugin capturedPlugin = argument.getValue();
assertEquals("org.test", capturedPlugin.getGroupId());
assertEquals("test", capturedPlugin.getArtifactId());