laeubi commented on a change in pull request #668:
URL: https://github.com/apache/maven/pull/668#discussion_r805199907
##########
File path: maven-core/src/main/java/org/apache/maven/DefaultMaven.java
##########
@@ -232,25 +232,40 @@ private MavenExecutionResult doExecute(
MavenExecutionRequest request, MavenSess
return addExceptionToResult( result, e );
}
- WorkspaceReader reactorWorkspace;
+ List<WorkspaceReader> workspaceReaders = new ArrayList<>();
+ WorkspaceReader repoWorkspaceReader = repoSession.getWorkspaceReader();
+ //
+ // Desired order of precedence for local artifact repositories
+ //
try
{
- reactorWorkspace = container.lookup( WorkspaceReader.class,
ReactorReader.HINT );
+ // 1) Reactor workspace reader
+ workspaceReaders.add( container.lookup( WorkspaceReader.class,
ReactorReader.HINT ) );
}
catch ( ComponentLookupException e )
{
return addExceptionToResult( result, e );
}
-
- //
- // Desired order of precedence for local artifact repositories
- //
- // Reactor
- // Workspace
+ if ( repoWorkspaceReader != null )
+ {
+ // 2) Repository system session scoped workspace reader
+ workspaceReaders.add( repoWorkspaceReader );
+ }
+ for ( WorkspaceReader workspaceReader : getProjectScopedExtensions(
session.getProjects(),
+
WorkspaceReader.class ) )
+ {
+ if ( workspaceReaders.contains( workspaceReader ) )
+ {
+ continue;
+ }
+ // 3) .. n) Project scoped workspace reader
Review comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@maven.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
