maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r695922 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
Date Tue, 16 Sep 2008 14:41:12 GMT
Author: sisbell
Date: Tue Sep 16 07:41:11 2008
New Revision: 695922

URL: http://svn.apache.org/viewvc?rev=695922&view=rev
Log:
Fix: Added a few cases to match dependency type on inheritance.

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=695922&r1=695921&r2=695922&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
Tue Sep 16 07:41:11 2008
@@ -105,7 +105,10 @@
                 {
                     this.groupId = mp.getResolvedValue();
                 }
-                else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.type ) &&
type == null )
+                else if ( type == null && mp.getUri().equals( ProjectUri.Dependencies.Dependency.type
)
+                        || mp.getUri().equals(ProjectUri.DependencyManagement.Dependencies.Dependency.type)
+                        || mp.getUri().equals(ProjectUri.Build.PluginManagement.Plugins.Plugin.Dependencies.Dependency.type)
+                        || mp.getUri().equals(ProjectUri.Build.Plugins.Plugin.Dependencies.Dependency.type))
                 {
                     this.type = mp.getResolvedValue();
                 }



Mime
View raw message