mirror of https://github.com/apache/maven.git
Readded fix for MNG-3863. Also included default group id for profiles.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721329 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
aba2b12837
commit
252065d9b4
|
@ -128,11 +128,12 @@ public final class ArtifactModelContainerFactory
|
|||
}
|
||||
if ( groupId == null )
|
||||
{
|
||||
groupId = "org.apache.maven.plugins";
|
||||
/* FIXME: This was meant to fix MNG-3863 but it's been reported to break Nexus/Mercury build so needs review
|
||||
if ( ProjectUri.Build.Plugins.Plugin.xUri.equals( uri )
|
||||
|| ProjectUri.Profiles.Profile.Build.Plugins.Plugin.xUri.equals( uri )
|
||||
|| ProjectUri.Build.PluginManagement.Plugins.Plugin.xUri.equals( uri )
|
||||
|| ProjectUri.Reporting.Plugins.Plugin.xUri.equals( uri ) )
|
||||
|| ProjectUri.Profiles.Profile.Build.PluginManagement.Plugins.Plugin.xUri.equals( uri )
|
||||
|| ProjectUri.Reporting.Plugins.Plugin.xUri.equals( uri )
|
||||
|| ProjectUri.Profiles.Profile.Reporting.Plugins.Plugin.xUri.equals( uri ))
|
||||
{
|
||||
groupId = "org.apache.maven.plugins";
|
||||
}
|
||||
|
@ -141,7 +142,6 @@ public final class ArtifactModelContainerFactory
|
|||
throw new IllegalArgumentException( "Properties do not contain group id. Artifact ID = "
|
||||
+ artifactId + ", Version = " + version );
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
if ( artifactId == null )
|
||||
|
|
Loading…
Reference in New Issue