You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/02/13 09:41:37 UTC
[maven] branch MNG-7400-3.8.x created (now 6f14196)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7400-3.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git.
at 6f14196 [MNG-7400] Allow more WorkspaceReaders to participate
This branch includes the following new commits:
new 6f14196 [MNG-7400] Allow more WorkspaceReaders to participate
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: [MNG-7400] Allow more WorkspaceReaders to participate
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7400-3.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6f141968464b4ad24e5d90f1389065141cda5e3b
Author: Christoph Läubrich <ch...@laeubi-soft.de>
AuthorDate: Sat Jan 29 18:09:47 2022 +0100
[MNG-7400] Allow more WorkspaceReaders to participate
This closes #668
---
.../main/java/org/apache/maven/DefaultMaven.java | 85 ++++++++++++++--------
1 file changed, 56 insertions(+), 29 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 7f052c1..12b8f4a 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -232,26 +232,15 @@ public class DefaultMaven
return addExceptionToResult( result, e );
}
- WorkspaceReader reactorWorkspace;
try
{
- reactorWorkspace = container.lookup( WorkspaceReader.class, ReactorReader.HINT );
+ setupWorkspaceReader( session, repoSession );
}
catch ( ComponentLookupException e )
{
return addExceptionToResult( result, e );
}
- //
- // Desired order of precedence for local artifact repositories
- //
- // Reactor
- // Workspace
- // User Local Repository
- //
- repoSession.setWorkspaceReader( ChainedWorkspaceReader.newInstance( reactorWorkspace,
- repoSession.getWorkspaceReader() ) );
-
repoSession.setReadOnly();
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
@@ -326,6 +315,34 @@ public class DefaultMaven
return result;
}
+ private void setupWorkspaceReader( MavenSession session, DefaultRepositorySystemSession repoSession )
+ throws ComponentLookupException
+ {
+ // Desired order of precedence for workspace readers before querying the local artifact repositories
+ List<WorkspaceReader> workspaceReaders = new ArrayList<WorkspaceReader>();
+ // 1) Reactor workspace reader
+ workspaceReaders.add( container.lookup( WorkspaceReader.class, ReactorReader.HINT ) );
+ // 2) Repository system session-scoped workspace reader
+ WorkspaceReader repoWorkspaceReader = repoSession.getWorkspaceReader();
+ if ( repoWorkspaceReader != null )
+ {
+ workspaceReaders.add( repoWorkspaceReader );
+ }
+ // 3) .. n) Project-scoped workspace readers
+ for ( WorkspaceReader workspaceReader : getProjectScopedExtensionComponents( session.getProjects(),
+ WorkspaceReader.class ) )
+ {
+ if ( workspaceReaders.contains( workspaceReader ) )
+ {
+ continue;
+ }
+ workspaceReaders.add( workspaceReader );
+ }
+ WorkspaceReader[] readers = workspaceReaders.toArray( new WorkspaceReader[0] );
+ repoSession.setWorkspaceReader( new ChainedWorkspaceReader( readers ) );
+
+ }
+
private void afterSessionEnd( Collection<MavenProject> projects, MavenSession session )
throws MavenExecutionException
{
@@ -369,47 +386,57 @@ public class DefaultMaven
{
Collection<AbstractMavenLifecycleParticipant> lifecycleListeners = new LinkedHashSet<>();
- ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
try
{
- try
- {
- lifecycleListeners.addAll( container.lookupList( AbstractMavenLifecycleParticipant.class ) );
- }
- catch ( ComponentLookupException e )
- {
- // this is just silly, lookupList should return an empty list!
- logger.warn( "Failed to lookup lifecycle participants: " + e.getMessage() );
- }
+ lifecycleListeners.addAll( container.lookupList( AbstractMavenLifecycleParticipant.class ) );
+ }
+ catch ( ComponentLookupException e )
+ {
+ // this is just silly, lookupList should return an empty list!
+ logger.warn( "Failed to lookup lifecycle participants: " + e.getMessage() );
+ }
+
+ lifecycleListeners.addAll( getProjectScopedExtensionComponents( projects,
+ AbstractMavenLifecycleParticipant.class ) );
- Collection<ClassLoader> scannedRealms = new HashSet<>();
+ return lifecycleListeners;
+ }
+ protected <T> Collection<T> getProjectScopedExtensionComponents( Collection<MavenProject> projects, Class<T> role )
+ {
+
+ Collection<T> foundComponents = new LinkedHashSet<>();
+ Collection<ClassLoader> scannedRealms = new HashSet<>();
+
+ Thread currentThread = Thread.currentThread();
+ ClassLoader originalContextClassLoader = currentThread.getContextClassLoader();
+ try
+ {
for ( MavenProject project : projects )
{
ClassLoader projectRealm = project.getClassRealm();
if ( projectRealm != null && scannedRealms.add( projectRealm ) )
{
- Thread.currentThread().setContextClassLoader( projectRealm );
+ currentThread.setContextClassLoader( projectRealm );
try
{
- lifecycleListeners.addAll( container.lookupList( AbstractMavenLifecycleParticipant.class ) );
+ foundComponents.addAll( container.lookupList( role ) );
}
catch ( ComponentLookupException e )
{
// this is just silly, lookupList should return an empty list!
- logger.warn( "Failed to lookup lifecycle participants: " + e.getMessage() );
+ logger.warn( "Failed to lookup " + role + ": " + e.getMessage() );
}
}
}
+ return foundComponents;
}
finally
{
- Thread.currentThread().setContextClassLoader( originalClassLoader );
+ currentThread.setContextClassLoader( originalContextClassLoader );
}
-
- return lifecycleListeners;
}
private MavenExecutionResult addExceptionToResult( MavenExecutionResult result, Throwable e )