You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/12/18 03:26:57 UTC
[2/3] maven git commit: [MNG-6135] Maven plugins and core extensions
are not dependencies, they should be resolved the same way as projects.
[MNG-6135] Maven plugins and core extensions are not dependencies, they should be resolved the same way as projects.
o Simplified selectors.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/80f2fd63
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/80f2fd63
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/80f2fd63
Branch: refs/heads/master
Commit: 80f2fd6375ad5311031929c1bbaf87aa42a3c53a
Parents: 2385484
Author: Christian Schulte <sc...@apache.org>
Authored: Sun Dec 18 04:24:32 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Sun Dec 18 04:24:32 2016 +0100
----------------------------------------------------------------------
.../maven/plugin/internal/PlexusUtilsInjector.java | 15 ++++++---------
.../apache/maven/plugin/internal/WagonExcluder.java | 7 +------
2 files changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/80f2fd63/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
index a69633f..eb36957 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
@@ -68,16 +68,13 @@ class PlexusUtilsInjector
find:
{
- if ( node.getDependency() != null )
+ if ( AID.equals( node.getArtifact().getArtifactId() )
+ && GID.equals( node.getArtifact().getGroupId() )
+ && EXT.equals( node.getArtifact().getExtension() )
+ && "".equals( node.getArtifact().getClassifier() ) )
{
- Artifact artifact = node.getDependency().getArtifact();
-
- if ( AID.equals( artifact.getArtifactId() ) && GID.equals( artifact.getGroupId() )
- && EXT.equals( artifact.getExtension() ) && "".equals( artifact.getClassifier() ) )
- {
- plexusUtils = node;
- break find;
- }
+ plexusUtils = node;
+ break find;
}
for ( DependencyNode child : node.getChildren() )
http://git-wip-us.apache.org/repos/asf/maven/blob/80f2fd63/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
index 8c21405..94a4814 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
@@ -58,12 +58,7 @@ class WagonExcluder
{
WagonExcluder child = this;
- if ( context.getDependency() == null && this.coreArtifact )
- {
- child = new WagonExcluder( false );
- }
- if ( context.getDependency() != null && !this.coreArtifact
- && isLegacyCoreArtifact( context.getDependency().getArtifact() ) )
+ if ( isLegacyCoreArtifact( context.getArtifact() ) && !this.coreArtifact )
{
child = new WagonExcluder( true );
}