geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1021640 - /geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
Date Tue, 12 Oct 2010 06:47:22 GMT
Author: genspring
Date: Tue Oct 12 06:47:22 2010
New Revision: 1021640

URL: http://svn.apache.org/viewvc?rev=1021640&view=rev
Log:
GERONIMO-5404 leverage the Artifact.equal() for dependency detect.

Modified:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java?rev=1021640&r1=1021639&r2=1021640&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
(original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PluginMetadataGeneratorMojo.java
Tue Oct 12 06:47:22 2010
@@ -307,14 +307,16 @@ public class PluginMetadataGeneratorMojo
     }
     
     private void removeIncludedModule(List<DependencyType> sourceList, Dependency removeTarget)
{
+       
         for (DependencyType dependencyType : sourceList) {
-            if ((dependencyType.getArtifactId().equals(removeTarget.artifactId))
-                    && (dependencyType.getGroupId().equals(removeTarget.groupId))
-                    && (dependencyType.getType().equals(removeTarget.type))
-                    && (dependencyType.getVersion().equals(removeTarget.version)))
{
+            
+            if (dependencyType.toArtifact().equals(removeTarget.toArtifactType().toArtifact())){
+                
                 sourceList.remove(dependencyType);
-                break;
             }
+            
+            break;
+            
         }
     }
 



Mime
View raw message