From 54cf64ca9dd19bf64d0860083f868112510174ba Mon Sep 17 00:00:00 2001
From: "Henning P. Schmiedehausen" <henning@schmiedehausen.org>
Date: Wed, 31 Aug 2022 09:52:59 -0700
Subject: [PATCH] [MNG-7529] Maven resolver makes bad repository choices

Structure the version checks slightly different to make the separation
between repository versions and the version range resolution clearer.

Backport from master branch
---
 .../internal/DefaultVersionRangeResolver.java | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index 3e2330f98010..491376f67e28 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.artifact.repository.metadata.Versioning;
 import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
 import org.eclipse.aether.RepositoryEvent;
@@ -72,8 +73,6 @@ public class DefaultVersionRangeResolver
 
     private static final String MAVEN_METADATA_XML = "maven-metadata.xml";
 
-    private static final String SNAPSHOT = "SNAPSHOT";
-
     private MetadataResolver metadataResolver;
 
     private SyncContextFactory syncContextFactory;
@@ -220,11 +219,12 @@ private Map<String, ArtifactRepository> getVersions( RepositorySystemSession ses
             }
 
             Versioning versioning = readVersions( session, trace, metadataResult.getMetadata(), repository, result );
-            RemoteRepository remoteRepository = metadataResult.getRequest().getRepository();
+
+            versioning = filterVersionsByRepositoryType( versioning, metadataResult.getRequest().getRepository() );
 
             for ( String version : versioning.getVersions() )
             {
-                if ( isEnabled( remoteRepository, version ) && !versionIndex.containsKey( version ) )
+                if ( !versionIndex.containsKey( version ) )
                 {
                     versionIndex.put( version, repository );
                 }
@@ -234,19 +234,6 @@ private Map<String, ArtifactRepository> getVersions( RepositorySystemSession ses
         return versionIndex;
     }
 
-    private boolean isEnabled( RemoteRepository remoteRepository, String version )
-    {
-        if ( remoteRepository == null )
-        {
-            return true;
-        }
-
-        boolean snapshot = version != null && version.endsWith( SNAPSHOT );
-
-        return remoteRepository.getPolicy( snapshot ).isEnabled();
-    }
-
-
     private Versioning readVersions( RepositorySystemSession session, RequestTrace trace, Metadata metadata,
                                      ArtifactRepository repository, VersionRangeResult result )
     {
@@ -278,6 +265,26 @@ private Versioning readVersions( RepositorySystemSession session, RequestTrace t
         return ( versioning != null ) ? versioning : new Versioning();
     }
 
+    private Versioning filterVersionsByRepositoryType( Versioning versioning, RemoteRepository remoteRepository )
+    {
+        if ( remoteRepository == null )
+        {
+            return versioning;
+        }
+
+        Versioning filteredVersions = versioning.clone();
+
+        for ( String version : versioning.getVersions() )
+        {
+            if ( !remoteRepository.getPolicy( ArtifactUtils.isSnapshot( version ) ).isEnabled() )
+            {
+                filteredVersions.removeVersion( version );
+            }
+        }
+
+        return filteredVersions;
+    }
+
     private void invalidMetadata( RepositorySystemSession session, RequestTrace trace, Metadata metadata,
                                   ArtifactRepository repository, Exception exception )
     {