You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/10/22 18:24:47 UTC

[maven] branch MNG-6759 created (now d0c1ffb)

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch MNG-6759
in repository https://gitbox.apache.org/repos/asf/maven.git.


      at d0c1ffb  - Fix issue where MavenMetadataSource failed to set the right repositories when preparing artifact metadata

This branch includes the following new commits:

     new d0c1ffb  - Fix issue where MavenMetadataSource failed to set the right repositories when preparing artifact metadata

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[maven] 01/01: - Fix issue where MavenMetadataSource failed to set the right repositories when preparing artifact metadata

Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MNG-6759
in repository https://gitbox.apache.org/repos/asf/maven.git

commit d0c1ffb378ca878d19171af63c9a1b0e14b67d20
Author: Stig Rohde Døssing <st...@gmail.com>
AuthorDate: Sat Oct 12 00:11:35 2019 +0200

    - Fix issue where MavenMetadataSource failed to set the right repositories when preparing artifact metadata
---
 .../java/org/apache/maven/project/artifact/MavenMetadataSource.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index 6cf9ec5..1c40af8 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -34,6 +34,7 @@ import java.util.Set;
 
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -53,6 +54,7 @@ import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.DistributionManagement;
@@ -191,6 +193,10 @@ public class MavenMetadataSource
             dependencies = model.getDependencies();
             DependencyManagement dependencyManagement = model.getDependencyManagement();
             managedDependencies = dependencyManagement == null ? null : dependencyManagement.getDependencies();
+            MavenSession session = legacySupport.getSession();
+            MavenProject project = session.getProjectMap().get(
+                ArtifactUtils.key( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() ) );
+            pomRepositories = project.getRemoteArtifactRepositories();
         }
         else if ( artifact instanceof ArtifactWithDependencies )
         {