You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/10/08 07:53:35 UTC
[maven-help-plugin] branch master updated: (doc) Use names already imported
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new b6c57aa (doc) Use names already imported
b6c57aa is described below
commit b6c57aa0afd6a18d7818392d9a4b54de71a2df5a
Author: Piotrek Żygieło <pz...@users.noreply.github.com>
AuthorDate: Wed Sep 28 19:03:13 2022 +0200
(doc) Use names already imported
---
src/main/java/org/apache/maven/plugins/help/DescribeMojo.java | 6 +++---
src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
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 9c58b02..d51d463 100644
--- a/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
@@ -432,7 +432,7 @@ public class DescribeMojo
if ( name == null )
{
// Can be null because of MPLUGIN-137 (and descriptors generated with maven-plugin-tools-api <= 2.4.3)
- org.eclipse.aether.artifact.Artifact aetherArtifact = new DefaultArtifact(
+ Artifact aetherArtifact = new DefaultArtifact(
pd.getGroupId(), pd.getArtifactId(), "jar", pd.getVersion() );
ProjectBuildingRequest pbr = new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() );
pbr.setRemoteRepositories( remoteRepositories );
@@ -978,9 +978,9 @@ public class DescribeMojo
pbr.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
try
{
- org.eclipse.aether.artifact.Artifact jar = resolveArtifact(
+ Artifact jar = resolveArtifact(
new DefaultArtifact( pd.getGroupId(), pd.getArtifactId(), "jar", pd.getVersion() ) ).getArtifact();
- org.eclipse.aether.artifact.Artifact pom = resolveArtifact(
+ Artifact pom = resolveArtifact(
new DefaultArtifact( pd.getGroupId(), pd.getArtifactId(), "pom", pd.getVersion() ) ).getArtifact();
MavenProject mavenProject = projectBuilder.build( pom.getFile(), pbr ).getProject();
urls.add( jar.getFile().toURI().toURL() );
diff --git a/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java b/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
index d80e7cd..4d326b2 100644
--- a/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
@@ -337,7 +337,7 @@ public class EffectivePomMojo
@Override
protected void writeXpp3DomToSerializer( Xpp3Dom dom, XmlSerializer serializer )
- throws java.io.IOException
+ throws IOException
{
// default method uses Xpp3Dom input location tracking, not available in older Maven versions
// use old Xpp3Dom serialization, without input location tracking