Get rid of deprecated PathTranslator

mojohaus · Aug 19, 2022 · b6c13cc · b6c13cc
1 parent f69438e
commit b6c13cc
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 30 deletions.
diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java
@@ -30,11 +30,11 @@
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.path.PathTranslator;
 import org.apache.maven.reporting.AbstractMavenReport;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.repository.RepositorySystem;
@@ -196,8 +196,8 @@ public abstract class AbstractVersionsReport
     @Parameter( defaultValue = "${session}", required = true, readonly = true )
     protected MavenSession session;
 
-    @Component
-    protected PathTranslator pathTranslator;
+    @Parameter( defaultValue = "${mojoExecution}", required = true, readonly = true )
+    private MojoExecution mojoExecution;
 
     @Component
     protected ArtifactResolver artifactResolver;
@@ -214,7 +214,7 @@ public VersionsHelper getHelper()
                 helper = new DefaultVersionsHelper( repositorySystem, artifactResolver, artifactMetadataSource,
                                                     remoteArtifactRepositories, remotePluginRepositories,
                                                     localRepository, wagonManager, settings, serverId, rulesUri,
-                                                    getLog(), session, pathTranslator );
+                                                    getLog(), session, mojoExecution );
             }
             catch ( MojoExecutionException e )
             {

diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java
@@ -31,6 +31,7 @@
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Component;
@@ -187,8 +188,8 @@ public abstract class AbstractVersionsUpdaterMojo
     @Parameter( defaultValue = "${session}", required = true, readonly = true )
     protected MavenSession session;
 
-    @Component
-    protected PathTranslator pathTranslator;
+    @Parameter( defaultValue = "${mojoExecution}", required = true, readonly = true )
+    private MojoExecution mojoExecution;
 
     @Component
     protected ArtifactResolver artifactResolver;
@@ -222,8 +223,8 @@ public VersionsHelper getHelper()
         {
             helper = new DefaultVersionsHelper( repositorySystem, artifactResolver, artifactMetadataSource,
                                                 remoteArtifactRepositories, remotePluginRepositories, localRepository,
-                                                wagonManager, settings, serverId, rulesUri, getLog(), session,
-                                                pathTranslator );
+                                                wagonManager, settings, serverId, rulesUri, getLog(),
+                                                session, mojoExecution );
         }
         return helper;
     }

diff --git a/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java b/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java
@@ -33,10 +33,10 @@
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
+import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.path.PathTranslator;
 import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.wagon.ConnectionException;
@@ -148,13 +148,6 @@ public class DefaultVersionsHelper
      */
     private final Log log;
 
-    /**
-     * The path translator.
-     *
-     * @since 1.0-beta-1
-     */
-    private final PathTranslator pathTranslator;
-
     /**
      * The maven session.
      *
@@ -169,6 +162,8 @@ public class DefaultVersionsHelper
      */
     private final ArtifactResolver artifactResolver;
 
+    private final MojoExecution mojoExecution;
+
     /**
      * Constructs a new {@link DefaultVersionsHelper}.
      *
@@ -184,22 +179,20 @@ public class DefaultVersionsHelper
      * @param rulesUri The URL to retrieve the versioning rules from.
      * @param log The {@link org.apache.maven.plugin.logging.Log} to send log messages to.
      * @param mavenSession The maven session information.
-     * @param pathTranslator The path translator component. @throws org.apache.maven.plugin.MojoExecutionException If
-     *            things go wrong.
      * @throws MojoExecutionException if something goes wrong.
      * @since 1.0-alpha-3
      */
     public DefaultVersionsHelper( RepositorySystem repositorySystem, ArtifactResolver artifactResolver,
                                   ArtifactMetadataSource artifactMetadataSource, List<ArtifactRepository> remoteArtifactRepositories,
                                   List<ArtifactRepository> remotePluginRepositories, ArtifactRepository localRepository,
                                   WagonManager wagonManager, Settings settings, String serverId, String rulesUri,
-                                  Log log, MavenSession mavenSession, PathTranslator pathTranslator )
+                                  Log log, MavenSession mavenSession, MojoExecution mojoExecution )
         throws MojoExecutionException
     {
         this.repositorySystem = repositorySystem;
         this.artifactResolver = artifactResolver;
         this.mavenSession = mavenSession;
-        this.pathTranslator = pathTranslator;
+        this.mojoExecution = mojoExecution;
         this.ruleSet = loadRuleSet( serverId, settings, wagonManager, rulesUri, log );
         this.artifactMetadataSource = artifactMetadataSource;
         this.localRepository = localRepository;
@@ -775,7 +768,7 @@ public PluginUpdatesDetails lookupPluginUpdates( Plugin plugin, boolean allowSna
     @Override
     public ExpressionEvaluator getExpressionEvaluator( MavenProject project )
     {
-        return new VersionsExpressionEvaluator( mavenSession, pathTranslator, project );
+        return new VersionsExpressionEvaluator( mavenSession, mojoExecution );
     }
 
     @Override

diff --git a/src/main/java/org/codehaus/mojo/versions/utils/VersionsExpressionEvaluator.java b/src/main/java/org/codehaus/mojo/versions/utils/VersionsExpressionEvaluator.java
@@ -22,9 +22,6 @@
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.PluginParameterExpressionEvaluator;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.path.PathTranslator;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
 
 /**
@@ -37,10 +34,8 @@ public class VersionsExpressionEvaluator
     extends PluginParameterExpressionEvaluator
     implements ExpressionEvaluator
 {
-    public VersionsExpressionEvaluator( MavenSession mavenSession, PathTranslator pathTranslator,
-                                        MavenProject mavenProject )
+    public VersionsExpressionEvaluator( MavenSession mavenSession, MojoExecution mojoExecution )
     {
-        super( mavenSession, new MojoExecution( new MojoDescriptor() ), pathTranslator, null, mavenProject,
-               mavenSession.getExecutionProperties() );
+        super( mavenSession, mojoExecution );
     }
 }
diff --git a/src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java b/src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java
@@ -28,6 +28,7 @@
 import org.apache.maven.artifact.resolver.DefaultArtifactResolver;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.artifact.MavenMetadataSource;
@@ -223,8 +224,8 @@ private DefaultVersionsHelper createHelper( String rulesUri, ArtifactMetadataSou
             new DefaultVersionsHelper( lookup( RepositorySystem.class ), new DefaultArtifactResolver(), metadataSource, new ArrayList(),
                                        new ArrayList(),
                                        new DefaultArtifactRepository( "", "", new DefaultRepositoryLayout() ),
-                                       wagonManager, new Settings(), "", rulesUri, mock( Log.class ), mock( MavenSession.class ),
-                                       new DefaultPathTranslator());
+                                       wagonManager, new Settings(), "", rulesUri, mock( Log.class ),
+                                       mock( MavenSession.class ), mock( MojoExecution.class ) );
         return helper;
     }