Skip to content

[MNG-6965] Drop Maven 2 support - stop injecting old plexus-utils #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
slachiewicz wants to merge 1 commit into from
Closed

[MNG-6965] Drop Maven 2 support - stop injecting old plexus-utils #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions ...ore/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.collection.CollectRequest;
import org.eclipse.aether.collection.DependencyCollectionException;
import org.eclipse.aether.collection.DependencyGraphTransformer;
import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.graph.DependencyNode;
Expand All @@ -61,7 +60,6 @@
import org.eclipse.aether.util.filter.ScopeDependencyFilter;
import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;

/**
Expand Down Expand Up @@ -145,20 +143,19 @@ public DependencyNode resolveCoreExtension( Plugin plugin, DependencyFilter depe
List<RemoteRepository> repositories, RepositorySystemSession session )
throws PluginResolutionException
{
return resolveInternal( plugin, null /* pluginArtifact */, dependencyFilter, null /* transformer */,
return resolveInternal( plugin, null /* pluginArtifact */, dependencyFilter,
repositories, session );
}

public DependencyNode resolve( Plugin plugin, Artifact pluginArtifact, DependencyFilter dependencyFilter,
List<RemoteRepository> repositories, RepositorySystemSession session )
throws PluginResolutionException
{
return resolveInternal( plugin, pluginArtifact, dependencyFilter, new PlexusUtilsInjector(), repositories,
return resolveInternal( plugin, pluginArtifact, dependencyFilter, repositories,
session );
}

private DependencyNode resolveInternal( Plugin plugin, Artifact pluginArtifact, DependencyFilter dependencyFilter,
DependencyGraphTransformer transformer,
List<RemoteRepository> repositories, RepositorySystemSession session )
throws PluginResolutionException
{
Expand All @@ -179,12 +176,9 @@ private DependencyNode resolveInternal( Plugin plugin, Artifact pluginArtifact,
DependencySelector selector =
AndDependencySelector.newInstance( session.getDependencySelector(), new WagonExcluder() );

transformer =
ChainedDependencyGraphTransformer.newInstance( session.getDependencyGraphTransformer(), transformer );

DefaultRepositorySystemSession pluginSession = new DefaultRepositorySystemSession( session );
pluginSession.setDependencySelector( selector );
pluginSession.setDependencyGraphTransformer( transformer );
pluginSession.setDependencyGraphTransformer( session.getDependencyGraphTransformer() );

CollectRequest request = new CollectRequest();
request.setRequestContext( REPOSITORY_CONTEXT );
Expand Down
87 changes: 0 additions & 87 deletions maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,15 +210,14 @@ public synchronized ProjectRealmCache.CacheRecord createProjectRealm( MavenProje
exportedArtifacts.put( extensionRealm, extensionDescriptor.getExportedArtifacts() );
}

if ( !plugin.isExtensions() && artifacts.size() == 2 && artifacts.get( 0 ).getFile() != null
&& "plexus-utils".equals( artifacts.get( 1 ).getArtifactId() ) )
if ( !plugin.isExtensions() && artifacts.size() == 1 && artifacts.get( 0 ).getFile() != null )
{
/*
* This is purely for backward-compat with 2.x where <extensions> consisting of a single artifact where
* loaded into the core and hence available to plugins, in contrast to bigger extensions that were
* loaded into a dedicated realm which is invisible to plugins (MNG-2749).
*/
publicArtifacts.add( artifacts.get( 0 ) );
publicArtifacts.addAll( artifacts );
}
}

Expand Down