svn commit: r1722740 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java

[rfscholte]

Author: rfscholte
Date: Sun Jan  3 18:42:08 2016
New Revision: 1722740

URL: http://svn.apache.org/viewvc?rev=1722740&view=rev
Log:
resolve path of artifact with RepositoryManager 

Modified:
    
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java?rev=1722740&r1=1722739&r2=1722740&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
 Sun Jan  3 18:42:08 2016
@@ -156,8 +156,7 @@ public class DefaultRepositoryAssembler
         Map<String, GroupVersionAlignment> groupVersionAlignments =
             createGroupVersionAlignments( 
repository.getGroupVersionAlignments() );
 
-        assembleRepositoryArtifacts( buildingRequest, result, filter, project, 
localRepository, targetRepository,
-                                     groupVersionAlignments );
+        assembleRepositoryArtifacts( buildingRequest, result, filter, 
groupVersionAlignments );
 
         ArtifactRepository centralRepository = findCentralRepository( project 
);
 
@@ -236,8 +235,7 @@ public class DefaultRepositoryAssembler
     }
 
     private void assembleRepositoryArtifacts( ProjectBuildingRequest 
buildingRequest, Iterable<ArtifactResult> result,
-                                              ArtifactFilter filter, 
MavenProject project,
-                                              ArtifactRepository 
localRepository, ArtifactRepository targetRepository,
+                                              ArtifactFilter filter,
                                               Map<String, 
GroupVersionAlignment> groupVersionAlignments )
                                                   throws 
RepositoryAssemblyException
     {
@@ -257,7 +255,9 @@ public class DefaultRepositoryAssembler
 
                     a.setVersion( a.getBaseVersion() );
 
-                    File targetFile = new File( targetRepository.getBasedir(), 
targetRepository.pathOf( a ) );
+                    File targetFile = new File( 
repositoryManager.getLocalRepositoryBasedir( buildingRequest ),
+                                                
repositoryManager.getPathForLocalArtifact( buildingRequest, a ) );
+                    
                     FileUtils.copyFile( a.getFile(), targetFile );
 
                     writeChecksums( targetFile );