You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/04/04 13:44:43 UTC
svn commit: r930665 -
/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
Author: bentmann
Date: Sun Apr 4 11:44:43 2010
New Revision: 930665
URL: http://svn.apache.org/viewvc?rev=930665&view=rev
Log:
[MNG-4619] Issue warning in case parent.relativePath points at POM with different groupId/artifactId
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=930665&r1=930664&r2=930665&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (original)
+++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Sun Apr 4 11:44:43 2010
@@ -553,12 +553,14 @@ public class DefaultModelBuilder
Parent parent = childModel.getParent();
- if ( groupId == null || !groupId.equals( parent.getGroupId() ) )
- {
- return null;
- }
- if ( artifactId == null || !artifactId.equals( parent.getArtifactId() ) )
+ if ( groupId == null || !groupId.equals( parent.getGroupId() ) || artifactId == null
+ || !artifactId.equals( parent.getArtifactId() ) )
{
+ problems.setSource( childModel );
+ problems.add( Severity.WARNING, "'parent.relativePath' of POM "
+ + ModelProblemUtils.toSourceHint( childModel ) + " points at " + groupId + ":" + artifactId
+ + " instead of " + parent.getGroupId() + ":" + parent.getArtifactId()
+ + ", please verify your project structure", null );
return null;
}
if ( version == null || !version.equals( parent.getVersion() ) )