You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/06/25 02:06:46 UTC

svn commit: r788216 - /geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java

Author: djencks
Date: Thu Jun 25 00:06:45 2009
New Revision: 788216

URL: http://svn.apache.org/viewvc?rev=788216&view=rev
Log:
GERONIMO-4682 Fix for duplicate timestamped/non-timestamped artifacts included in plans.  Not sure if it will fix original problem

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

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=788216&r1=788215&r2=788216&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Thu Jun 25 00:06:45 2009
@@ -358,7 +358,7 @@
 
 
             getDependencies(project, useMavenDependencies.isUseTransitiveDependencies());
-            for (org.apache.maven.artifact.Artifact artifact : localDependencies) {
+            for (Artifact artifact : localDependencies) {
                 Dependency explicitDependency = explicitDependencyMap.get(getKey(artifact));
                 dependencies.add(toDependency(artifact, useMavenDependencies.isIncludeVersion(), explicitDependency, includeImport));
             }
@@ -371,7 +371,7 @@
         Dependency dependency = new Dependency();
         dependency.setGroupId(artifact.getGroupId());
         dependency.setArtifactId(artifact.getArtifactId());
-        dependency.setVersion(includeVersion ? artifact.getVersion() : null);
+        dependency.setVersion(includeVersion ? artifact.getVersionRange().getRecommendedVersion().toString() : null);
         dependency.setType(artifact.getType());
         String importType = ImportType.ALL.getName();
         if (includeImport && explicitDependency != null && explicitDependency.getImport() != null) {