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 2020/10/03 23:49:55 UTC
[maven] branch MNG-6965 updated: Remove related Plexus Utils hack
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6965
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-6965 by this push:
new e9e4368 Remove related Plexus Utils hack
e9e4368 is described below
commit e9e436866c46bd8b8b951562a453c134582cb754
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Oct 4 01:29:58 2020 +0200
Remove related Plexus Utils hack
---
.../java/org/apache/maven/project/DefaultProjectBuildingHelper.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
index 33256fb..e5c89e6 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
@@ -210,15 +210,14 @@ public class DefaultProjectBuildingHelper
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 );
}
}