#704: Removing ArtifactRepository leftovers; using ranges for version…

… resolution
mojohaus · Dec 3, 2022 · a4b99bf · a4b99bf
1 parent bc10d1a
commit a4b99bf
Show file tree

Hide file tree

Showing 14 changed files with 248 additions and 749 deletions.
diff --git a/versions-common/pom.xml b/versions-common/pom.xml
@@ -40,10 +40,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-compat</artifactId>
-            <version>${mavenVersion}</version>
-            <scope>provided</scope>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-provider-api</artifactId>
+            <version>3.5.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -110,6 +109,13 @@
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Required by Maven Testing Harness -->
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-compat</artifactId>
+            <version>${mavenVersion}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java b/versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java
@@ -53,6 +53,7 @@
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
@@ -175,7 +176,8 @@ public Log getLog()
     }
 
     @Override
-    public ArtifactVersions lookupArtifactVersions( Artifact artifact, boolean usePluginRepositories )
+    public ArtifactVersions lookupArtifactVersions( Artifact artifact, VersionRange versionRange,
+                                                    boolean usePluginRepositories )
             throws VersionRetrievalException
     {
         try
@@ -189,11 +191,14 @@ public ArtifactVersions lookupArtifactVersions( Artifact artifact, boolean usePl
             return new ArtifactVersions( artifact,
                     aetherRepositorySystem.resolveVersionRange( mavenSession.getRepositorySession(),
                                     new VersionRangeRequest(
-                                    toArtifact( artifact ).setVersion( "(,)" ),
-                                    usePluginRepositories
-                                            ? mavenSession.getCurrentProject().getRemotePluginRepositories()
-                                            : mavenSession.getCurrentProject().getRemoteProjectRepositories(),
-                                    "lookupArtifactVersions" ) )
+                                            toArtifact( artifact ).setVersion(
+                                                    versionRange != null
+                                                            ? versionRange.toString()
+                                                            : "(,)" ),
+                                            usePluginRepositories
+                                                    ? mavenSession.getCurrentProject().getRemotePluginRepositories()
+                                                    : mavenSession.getCurrentProject().getRemoteProjectRepositories(),
+                                            "lookupArtifactVersions" ) )
                             .getVersions()
                             .parallelStream()
                             .filter( v -> ignoredVersions.stream()
@@ -237,6 +242,13 @@ public ArtifactVersions lookupArtifactVersions( Artifact artifact, boolean usePl
         }
     }
 
+    @Override
+    public ArtifactVersions lookupArtifactVersions( Artifact artifact, boolean usePluginRepositories )
+            throws VersionRetrievalException
+    {
+        return lookupArtifactVersions( artifact, null, usePluginRepositories );
+    }
+
     /**
      * Returns a list of versions which should not be considered when looking for updates.
      *

diff --git a/versions-common/src/main/java/org/codehaus/mojo/versions/api/PomHelper.java b/versions-common/src/main/java/org/codehaus/mojo/versions/api/PomHelper.java
@@ -37,7 +37,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 import java.util.Stack;
@@ -57,7 +56,6 @@
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.ReportPlugin;
 import org.apache.maven.model.building.ModelBuildingRequest;
-import org.apache.maven.model.building.UrlModelSource;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
@@ -1523,32 +1521,6 @@ public static MavenProject getLocalRoot( ProjectBuilder projectBuilder,
         }
     }
 
-    /**
-     * Retrieves the standalone superproject
-     *
-     * @param projectBuilder       {@link ProjectBuilder} instance
-     * @param mavenSession         {@link MavenSession} instance
-     * @param logger               The logger to log tog
-     *
-     * @return superproject retrieved
-     * @throws ProjectBuildingException if the retrieval fails
-     */
-    public static MavenProject getStandaloneSuperProject( ProjectBuilder projectBuilder,
-                                                          MavenSession mavenSession,
-                                                          Log logger ) throws ProjectBuildingException
-    {
-        ProjectBuildingResult result = projectBuilder.build( new UrlModelSource(
-                        Objects.requireNonNull( PomHelper.class.getResource( "standalone.xml" ) ) ),
-                createProjectBuilderRequest( mavenSession, r -> r.setProcessPlugins( false ) ) );
-        if ( !result.getProblems().isEmpty()  )
-        {
-            logger.warn( "Problems encountered during building of the superproject." );
-            result.getProblems().forEach( p ->
-                    logger.warn( "\t" + p.getMessage() ) );
-        }
-        return result.getProject();
-    }
-
     /**
      * <p>Convenience method for creating a {@link ProjectBuildingRequest} instance based on maven session.</p>
      * <p><u>Note:</u> The method initializes the remote repositories with the remote artifact repositories.

diff --git a/versions-common/src/main/java/org/codehaus/mojo/versions/api/VersionsHelper.java b/versions-common/src/main/java/org/codehaus/mojo/versions/api/VersionsHelper.java
@@ -27,6 +27,7 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -154,6 +155,22 @@ Artifact createDependencyArtifact( String groupId, String artifactId, String ver
     ArtifactVersions lookupArtifactVersions( Artifact artifact, boolean usePluginRepositories )
             throws VersionRetrievalException;
 
+    /**
+     * Looks up the versions of the specified artifact that are available in either the local repository, or the
+     * appropriate remote repositories.
+     *
+     * @param artifact The artifact to look for versions of.
+     * @param versionRange versionRange to restrict the search
+     * @param usePluginRepositories <code>true</code> will consult the pluginRepositories, while <code>false</code> will
+     *            consult the repositories for normal dependencies.
+     * @return The details of the available artifact versions.
+     * @throws VersionRetrievalException thrown if version resolution fails
+     * @since 1.0-alpha-3
+     */
+    ArtifactVersions lookupArtifactVersions( Artifact artifact, VersionRange versionRange,
+                                             boolean usePluginRepositories )
+            throws VersionRetrievalException;
+
     /**
      * Looks up the updates for a set of dependencies.
      *

diff --git a/versions-enforcer/pom.xml b/versions-enforcer/pom.xml
@@ -46,13 +46,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-compat</artifactId>
-            <version>${mavenVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>

diff --git a/...ns-enforcer/src/test/java/org/apache/maven/plugins/enforcer/MaxDependencyUpdatesTest.java b/...ns-enforcer/src/test/java/org/apache/maven/plugins/enforcer/MaxDependencyUpdatesTest.java
@@ -20,14 +20,11 @@
 
 import java.util.HashMap;
 
-import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
 import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
 import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.repository.RepositorySystem;
-import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.junit.Test;
@@ -57,23 +54,17 @@ private static EnforcerRuleHelper mockRuleHelper( MavenProject mavenProject,
         when( ruleHelper.evaluate( anyString() ) )
                 .then( ( a ) -> "${project}".equals( a.getArgument( 0 ) )
                         ? mavenProject
-                        : "${localRepository}".equals( a.getArgument( 0 ) )
-                            ? new StubArtifactRepository( "" )
-                            : "${settings}".equals( a.getArgument( 0 ) )
-                                ? new Settings()
-                                : "${session}".equals( a.getArgument( 0 ) )
-                                    ? mockMavenSession()
-                                    : "${mojoExecution}".equals( a.getArgument( 0 ) )
-                                        ? mock( MojoExecution.class )
-                                        : null );
+                        : "${session}".equals( a.getArgument( 0 ) )
+                            ? mockMavenSession()
+                            : "${mojoExecution}".equals( a.getArgument( 0 ) )
+                                ? mock( MojoExecution.class )
+                                : null );
         when( ruleHelper.getComponent( ArgumentMatchers.<Class<?>>any() ) )
                 .then( ( a ) -> a.getArgument( 0 ) == RepositorySystem.class
                         ? mockRepositorySystem()
-                        : a.getArgument( 0 ) == ArtifactResolver.class
-                            ? mock( ArtifactResolver.class )
-                            : a.getArgument( 0 ) == org.eclipse.aether.RepositorySystem.class
-                                ? aetherRepositorySystem
-                                : null );
+                        : a.getArgument( 0 ) == org.eclipse.aether.RepositorySystem.class
+                            ? aetherRepositorySystem
+                            : null );
         return ruleHelper;
     }
 

diff --git a/versions-maven-plugin/pom.xml b/versions-maven-plugin/pom.xml
@@ -58,12 +58,6 @@
       <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
@@ -162,6 +156,13 @@
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Required by Maven Testing Harness -->
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java
@@ -24,9 +24,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.siterenderer.Renderer;
 import org.apache.maven.execution.MavenSession;
@@ -38,9 +35,7 @@
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.wagon.Wagon;
-import org.codehaus.mojo.versions.api.ArtifactVersions;
 import org.codehaus.mojo.versions.api.DefaultVersionsHelper;
-import org.codehaus.mojo.versions.api.VersionRetrievalException;
 import org.codehaus.mojo.versions.api.VersionsHelper;
 import org.codehaus.mojo.versions.model.RuleSet;
 import org.codehaus.mojo.versions.reporting.ReportRendererFactory;
@@ -243,35 +238,6 @@ protected void executeReport( Locale locale )
     protected abstract void doGenerateReport( Locale locale, Sink sink )
         throws MavenReportException, MojoExecutionException;
 
-    /**
-     * Finds the latest version of the specified artifact that matches the version range.
-     *
-     * @param artifact The artifact.
-     * @param versionRange The version range.
-     * @param allowingSnapshots <code>null</code> for no override, otherwise the local override to apply.
-     * @param usePluginRepositories Use plugin repositories
-     * @return The latest version of the specified artifact that matches the specified version range or
-     *         <code>null</code> if no matching version could be found.
-     * @throws MavenReportException If the artifact metadata could not be found.
-     * @since 1.0-alpha-1
-     */
-    protected ArtifactVersion findLatestVersion( Artifact artifact, VersionRange versionRange,
-                                                 Boolean allowingSnapshots, boolean usePluginRepositories )
-        throws MavenReportException
-    {
-        boolean includeSnapshots = allowingSnapshots != null ? allowingSnapshots : this.allowSnapshots;
-        try
-        {
-            final ArtifactVersions artifactVersions =
-                getHelper().lookupArtifactVersions( artifact, usePluginRepositories );
-            return artifactVersions.getNewestVersion( versionRange, includeSnapshots );
-        }
-        catch ( VersionRetrievalException e )
-        {
-            throw new MavenReportException( e.getMessage(), e );
-        }
-    }
-
     @Override
     protected MavenProject getProject()
     {

diff --git a/...ns-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java b/...ns-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java
@@ -308,7 +308,8 @@ protected ArtifactVersion findLatestVersion( Artifact artifact, VersionRange ver
             throws MojoExecutionException, VersionRetrievalException
     {
         boolean includeSnapshots = allowingSnapshots != null ? allowingSnapshots : this.allowSnapshots;
-        final ArtifactVersions artifactVersions = getHelper().lookupArtifactVersions( artifact, usePluginRepositories );
+        final ArtifactVersions artifactVersions = getHelper().lookupArtifactVersions( artifact, versionRange,
+                usePluginRepositories );
         return artifactVersions.getNewestVersion( versionRange, null, includeSnapshots, false );
     }