Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix missing 'groupId' tag in parent model, for instance 

when the parent model also has a <parent> and doesn't specify a groupId.

This would also be resolved if maven-model would just have getVersion
and getGroupId implementations that check for the <parent> tag's 
versions of these attributes when the current ones are null.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280537 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kenney Westerhof 2005-09-13 11:22:39 +00:00
parent 7af50bb584
commit 2af27a640f
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -754,14 +754,17 @@ public class DefaultMavenProjectBuilder
{
Model candidateParent = readModel( parentDescriptor );
// this works because parent-version is still required...
boolean versionMatches = parentModel.getVersion().equals( candidateParent.getVersion() );
if ( !versionMatches && candidateParent.getParent() != null )
{
versionMatches = parentModel.getVersion().equals( candidateParent.getParent().getVersion() );
}
if ( parentModel.getGroupId().equals( candidateParent.getGroupId() ) &&
parentModel.getArtifactId().equals( candidateParent.getArtifactId() ) && versionMatches )
String candidateParentGroupId = candidateParent.getGroupId();
if ( candidateParentGroupId == null && candidateParent.getParent() != null )
candidateParentGroupId = candidateParent.getParent().getGroupId();
String candidateParentVersion = candidateParent.getVersion();
if ( candidateParentVersion == null && candidateParent.getParent() != null )
candidateParentVersion = candidateParent.getParent().getVersion();
if ( parentModel.getGroupId().equals( candidateParentGroupId ) &&
parentModel.getArtifactId().equals( candidateParent.getArtifactId() ) &&
parentModel.getVersion().equals( candidateParentVersion ) )
{
model = candidateParent;
@ -770,9 +773,11 @@ public class DefaultMavenProjectBuilder
}
else
{
getLogger().debug( "Invalid parent-POM referenced by relative path: \'" +
parentModel.getRelativePath() + "\'. It did not match parent specification in " +
project.getId() );
getLogger().debug( "Invalid parent-POM referenced by relative path '" +
parentModel.getRelativePath() + "' in parent specification in " + project.getId() + ":" +
"\n Specified: " + parentModel.getId() +
"\n Found: " + candidateParent.getId()
);
}
}
}