svn commit: r123615 - /maven/maven-1/plugins/trunk/gump/src/plugin-resources/project.jelly

[br...@apache.org]

Author: brett
Date: Wed Dec 29 01:41:55 2004
New Revision: 123615

URL: http://svn.apache.org/viewcvs?view=rev&rev=123615
Log:
avoid duplicate dependencies and sort them

Modified:
   maven/maven-1/plugins/trunk/gump/src/plugin-resources/project.jelly

Modified: maven/maven-1/plugins/trunk/gump/src/plugin-resources/project.jelly
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/gump/src/plugin-resources/project.jelly?view=diff&rev=123615&p1=maven/maven-1/plugins/trunk/gump/src/plugin-resources/project.jelly&r1=123614&p2=maven/maven-1/plugins/trunk/gump/src/plugin-resources/project.jelly&r2=123615
==============================================================================
--- maven/maven-1/plugins/trunk/gump/src/plugin-resources/project.jelly	(original)
+++ maven/maven-1/plugins/trunk/gump/src/plugin-resources/project.jelly	Wed Dec 29 01:41:55 2004
@@ -31,6 +31,17 @@
 <!-- As the test reports is a plugin property, we can't reliably get it from the project context. Forced to assume the default -->
 <maven:get var="testReportsDirectory" plugin="maven-test-plugin" property="maven.test.reportsDirectory" />
 <maven:makeRelativePath basedir="${basedir}" var="mavenTestReportsDest" separator="/" path="${testReportsDirectory}" />
+<j:new var="dependentProjects" className="java.util.TreeSet" />
+<j:forEach var="dep" items="${project.dependencies}">
+  <j:choose>
+    <j:when test="${dep.getProperty('gump.project') != null}">
+      <j:set var="dummy">${dependentProjects.add(dep.getProperty('gump.project'))}</j:set>
+    </j:when>
+    <j:otherwise>
+      <j:set var="dummy">${dependentProjects.add(dep.artifactId)}</j:set>
+    </j:otherwise>
+  </j:choose>
+</j:forEach>
 
 <j:whitespace>
   <project name="${project.artifactId}">
@@ -42,7 +53,7 @@
       <![CDATA[<property project="${dep.getProperty('gump.project')}" name="maven.jar.${dep.artifactId}" reference="jarpath" ]]><j:if test="${dep.getProperty('gump.id') != null}"><![CDATA[id="${dep.getProperty('gump.id')}" ]]></j:if><![CDATA[/>]]></j:if></j:forEach>
     </maven></j:if>
 
-    <j:forEach var="dep" items="${project.dependencies}"><j:choose><j:when test="${dep.getProperty('gump.project') != null}"><![CDATA[<depend project="${dep.getProperty('gump.project')}" />]]></j:when><j:otherwise><![CDATA[<depend project="${dep.artifactId}" />]]></j:otherwise></j:choose>
+    <j:forEach var="dep" items="${dependentProjects}"><![CDATA[<depend project="${dep}" />]]>
     </j:forEach><![CDATA[
     <home nested="${homeDir}" />
 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org