[MNG-8325][MNG-8326][MNG-8327] Fix bugs

maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelResolver.java

@@ -59,6 +59,7 @@ default ModelSource resolveModel(
                 parent.getGroupId(),
                 parent.getArtifactId(),
                 parent.getVersion(),
+                null,
                 version -> modified.set(parent.withVersion(version)));
     }
 
@@ -85,6 +86,7 @@ default ModelSource resolveModel(
                 dependency.getGroupId(),
                 dependency.getArtifactId(),
                 dependency.getVersion(),
+                dependency.getClassifier(),
                 version -> modified.set(dependency.withVersion(version)));
     }
 
@@ -95,6 +97,7 @@ ModelSource resolveModel(
             @Nonnull String groupId,
             @Nonnull String artifactId,
             @Nonnull String version,
+            @Nullable String classifier,
             @Nonnull Consumer<String> resolvedVersion)
             throws ModelResolverException;
 }

maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java

@@ -71,6 +71,7 @@ public ModelSource resolveModel(
                 parent.getArtifactId(),
                 parent.getVersion(),
                 "parent",
+                null,
                 parent.getLocation("version"),
                 version -> modified.set(parent.withVersion(version)));
     }
@@ -89,6 +90,7 @@ public ModelSource resolveModel(
                 dependency.getArtifactId(),
                 dependency.getVersion(),
                 "dependency",
+                dependency.getClassifier(),
                 dependency.getLocation("version"),
                 version -> modified.set(dependency.withVersion(version)));
     }
@@ -100,9 +102,11 @@ public ModelSource resolveModel(
             @Nonnull String groupId,
             @Nonnull String artifactId,
             @Nonnull String version,
+            @Nullable String classifier,
             @Nonnull Consumer<String> resolvedVersion)
             throws ModelResolverException {
-        return resolveModel(session, repositories, groupId, artifactId, version, null, null, resolvedVersion);
+        return resolveModel(
+                session, repositories, groupId, artifactId, version, null, classifier, null, resolvedVersion);
     }
 
     @SuppressWarnings("checkstyle:ParameterNumber")
@@ -113,11 +117,13 @@ public ModelSource resolveModel(
             String artifactId,
             String version,
             String type,
+            String classifier,
             InputLocation location,
             Consumer<String> resolvedVersion)
             throws ModelResolverException {
         try {
-            ArtifactCoordinates coords = session.createArtifactCoordinates(groupId, artifactId, version, "pom");
+            ArtifactCoordinates coords =
+                    session.createArtifactCoordinates(groupId, artifactId, version, classifier, "pom", null);
             if (coords.getVersionConstraint().getVersionRange() != null
                     && coords.getVersionConstraint().getVersionRange().getUpperBoundary() == null) {
                 // Message below is checked for in the MNG-2199 core IT.
@@ -143,7 +149,7 @@ public ModelSource resolveModel(
                 resolvedVersion.accept(newVersion);
             }
 
-            Path path = getPath(session, repositories, groupId, artifactId, newVersion);
+            Path path = getPath(session, repositories, groupId, artifactId, newVersion, classifier);
             return new ResolverModelSource(path, groupId + ":" + artifactId + ":" + newVersion);
         } catch (VersionRangeResolverException | ArtifactResolverException e) {
             throw new ModelResolverException(
@@ -163,9 +169,10 @@ protected Path getPath(
             List<RemoteRepository> repositories,
             String groupId,
             String artifactId,
-            String newVersion) {
+            String version,
+            String classifier) {
         DownloadedArtifact resolved = session.resolveArtifact(
-                session.createArtifactCoordinates(groupId, artifactId, newVersion, "pom"), repositories);
+                session.createArtifactCoordinates(groupId, artifactId, version, classifier, "pom", null), repositories);
         return resolved.getPath();
     }
 

maven-core/src/main/java/org/apache/maven/ReactorReader.java

@@ -43,6 +43,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.apache.maven.api.feature.Features;
 import org.apache.maven.api.model.Model;
 import org.apache.maven.api.services.Lookup;
 import org.apache.maven.eventspy.EventSpy;
@@ -412,7 +413,20 @@ private boolean isRegularFile(Artifact artifact) {
     }
 
     private void installIntoProjectLocalRepository(Artifact artifact) {
-        Path target = getArtifactPath(artifact);
+        String extension = artifact.getExtension();
+        String classifier = artifact.getClassifier();
+        if (Features.consumerPom(session.getUserProperties())) {
+            if ("pom".equals(extension)) {
+                if (classifier == null || classifier.isEmpty()) {
+                    classifier = "build";
+                } else if (classifier.equals("consumer")) {
+                    classifier = null;
+                }
+            }
+        }
+
+        Path target = getArtifactPath(
+                artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), classifier, extension);
         try {
             LOGGER.info("Copying {} to project local repository", artifact);
             Files.createDirectories(target.getParent());
@@ -432,6 +446,11 @@ private Path getArtifactPath(Artifact artifact) {
         String version = artifact.getBaseVersion();
         String classifier = artifact.getClassifier();
         String extension = artifact.getExtension();
+        return getArtifactPath(groupId, artifactId, version, classifier, extension);
+    }
+
+    private Path getArtifactPath(
+            String groupId, String artifactId, String version, String classifier, String extension) {
         Path repo = getProjectLocalRepo();
         return repo.resolve(groupId)
                 .resolve(artifactId)

maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java

@@ -323,7 +323,12 @@ class BuildSession implements AutoCloseable {
                     RepositoryUtils.overlay(request.getLocalRepository(), request.getRepositorySession(), repoSystem);
             InternalSession iSession = InternalSession.from(session);
             this.modelBuilderSession = modelBuilder.newSession();
-            iSession.getData().set(SessionData.key(ModelBuilder.ModelBuilderSession.class), modelBuilderSession);
+            // Save the ModelBuilderSession for later retrieval by the DefaultConsumerPomBuilder.
+            // Use replace(key, null, value) to make sure the *main* session, i.e. the one used
+            // to load the projects, is stored. This is to avoid the session being overwritten
+            // if a plugin uses the ProjectBuilder.
+            iSession.getData()
+                    .replace(SessionData.key(ModelBuilder.ModelBuilderSession.class), null, modelBuilderSession);
         }
 
         @Override

maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilderTest.java

@@ -136,6 +136,7 @@ public ModelSource resolveModel(
                 String groupId,
                 String artifactId,
                 String version,
+                String classifier,
                 Consumer<String> resolvedVersion)
                 throws ModelResolverException {
             String id = groupId + ":" + artifactId + ":" + version;