From 252065d9b413927c81c98a13e8cf474d4f9f73bd Mon Sep 17 00:00:00 2001 From: Britton Isbell Date: Fri, 28 Nov 2008 03:31:06 +0000 Subject: [PATCH] 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 --- .../project/builder/ArtifactModelContainerFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java b/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java index 248cf9f3ec..192f321598 100644 --- a/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java +++ b/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java @@ -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 )