mirror of https://github.com/apache/maven.git
Fixed problem with inheriting versions of artifacts.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@697979 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
2ce56f8aa4
commit
83c2ba498d
|
@ -165,9 +165,23 @@ public final class ArtifactModelContainerFactory
|
||||||
return ModelContainerAction.NOP;
|
return ModelContainerAction.NOP;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return ModelContainerAction.DELETE;//TODO Verify - PluginManagement Section may make versions equal
|
return ModelContainerAction.JOIN;
|
||||||
|
}
|
||||||
|
if ( version == null )
|
||||||
|
{
|
||||||
|
if ( c.version == null )
|
||||||
|
{
|
||||||
|
if ( c.type.equals( type ) )
|
||||||
|
{
|
||||||
|
return ModelContainerAction.JOIN;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return ModelContainerAction.NOP;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ModelContainerAction.JOIN;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( c.version.equals( version ) )
|
if ( c.version.equals( version ) )
|
||||||
{
|
{
|
||||||
if ( c.type.equals( type ) )
|
if ( c.type.equals( type ) )
|
||||||
|
|
Loading…
Reference in New Issue