Author: sisbell
Date: Thu Nov 27 19:31:06 2008
New Revision: 721329
URL: http://svn.apache.org/viewvc?rev=721329&view=rev
Log:
Readded fix for MNG-3863. Also included default group id for profiles.
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
Modified: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=721329&r1=721328&r2=721329&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
(original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
Thu Nov 27 19:31:06 2008
@@ -128,11 +128,12 @@
}
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 @@
throw new IllegalArgumentException( "Properties do not contain group
id. Artifact ID = "
+ artifactId + ", Version = " + version );
}
- */
}
if ( artifactId == null )
|