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

[FIXES MNG-5840] if the pom.xml at <relativePath> is the same groupId:artifactId but different version fall back to the repository for parent resolution

This commit is contained in:
Stephen Connolly 2015-06-05 11:26:13 +01:00
parent 5c6024219f
commit 40d5087b6b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
View File

@ -919,6 +919,11 @@ public class DefaultModelBuilder
.setMessage( buffer.toString() ).setLocation( parent.getLocation( "" ) ) ); .setMessage( buffer.toString() ).setLocation( parent.getLocation( "" ) ) );
return null; return null;
} }
if ( version != null && parent.getVersion() != null && !version.equals( parent.getVersion() ) )
{
// version skew drop back to resolution from the repository
return null;
}
// //
// Here we just need to know that a version is fine to use but this validation we can do in our workspace // Here we just need to know that a version is fine to use but this validation we can do in our workspace