You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/09/22 22:36:36 UTC
svn commit: r697979 -
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
Author: sisbell
Date: Mon Sep 22 13:36:35 2008
New Revision: 697979
URL: http://svn.apache.org/viewvc?rev=697979&view=rev
Log:
Fixed problem with inheriting versions of artifacts.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=697979&r1=697978&r2=697979&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java Mon Sep 22 13:36:35 2008
@@ -165,9 +165,23 @@
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.type.equals( type ) )