MPECLIPSE-36 JUnit jar not add in a specific condition

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115939 13f79535-47bb-0310-9956-ffa450edef68

eclipse/src/plugin-resources/templates/classpath.jelly

@@ -64,7 +64,8 @@
     <maven:makeRelativePath var="srcDir" basedir="${basedir}" path="${res}" />
     <classpathentry kind="src" path="${srcDir}"/>
   </j:forEach>
-
+  <!-- set a flag so JUnit jar is included only once -->
+  <j:set var="ignoreJUnit" value="false" />
   <j:if test="${unitTestSourcesPresent}">
     <ant:echo>Contains JUnit tests</ant:echo>
     <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}"/>
@@ -105,6 +106,7 @@
     </j:if>
       
     <j:if test="${depVersion != 'none'}">
+      <j:set var="ignoreJUnit" value="true" />
       <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-${depVersion}.jar"/>
     </j:if>
   </j:if>
@@ -135,7 +137,7 @@
       <j:when test="${eclipseDependency == 'false'}">
         <!-- ignore specific dependencies -->
       </j:when>      
-      <j:when test="${lib.dependency.groupId == 'junit'}">
+      <j:when test="${lib.dependency.groupId == 'junit' and ignoreJUnit}">
         <!-- ignoring junit dependency as we've already created it -->
       </j:when>
       <j:otherwise>