Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPECLIPSE-38 Jar Overrides are now properly supported.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116069 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
epugh 2004-09-24 15:51:01 +00:00
parent 2e8a3d4c4d
commit 54539ba5d2
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eclipse/src/plugin-resources/templates/classpath.jelly
View File

@ -149,7 +149,8 @@
<!-- make sure it's a classpath dependency -->
<j:set var="isClasspath" value="${lib.dependency.isAddedToClasspath()}"/>
<j:if test="${isClasspath}">
<classpathentry kind="var" path="MAVEN_REPO${lib.urlPath}"/>
<maven:makeRelativePath var="relativePath" basedir="${maven.repo.local}" path="${lib.path}"/>
<classpathentry kind="var" path="MAVEN_REPO/${relativePath}"/>
</j:if>
</j:otherwise>
</j:choose>

10
eclipse/src/plugin-test/maven.xml
View File

@ -38,7 +38,7 @@
<u:file var="classpathFile" name="${dotClasspath}"/>
<x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
<x:set var="countJUnit" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/junit/jars/junit-3.8.1.jar')])"/>
<x:set var="countJUnit" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/junit\jars\junit-3.8.1.jar')])"/>
<assert:assertEquals expected="1" value="${countJUnit.intValue().toString()}" msg="JUnit dependency not found"/>
<x:set var="countCactus" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/cactus/jars/cactus-13-1.6.1.jar')])"/>
<assert:assertEquals expected="1" value="${countCactus.intValue().toString()}" msg="More than one Cactus dependencies found"/>
@ -111,7 +111,7 @@
<u:file var="classpathFile" name="${dotClasspath}"/>
<x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@kind,'src')])"/>
<assert:assertEquals expected="3" value="${count.intValue().toString()}"/>
<assert:assertEquals expected="3" value="${count.intValue().toString()}" msg="Not enough generated src directories found"/>
</goal>
@ -123,8 +123,10 @@
<u:file var="classpathFile" name="${dotClasspath}"/>
<x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/maven/jars/maven.jar')])"/>
<assert:assertEquals expected="1" value="${count.intValue().toString()}"/>
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/maven\jars\maven.jar')])"/>
<assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="override by jar tag not found"/>
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/commons-logging\jars\commons-logging-1.0.3.jar')])"/>
<assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="maven.jar.override didn't work"/>
</goal>

4
eclipse/src/plugin-test/project.properties
View File

@ -1 +1,3 @@
cactus.src.dir=.
cactus.src.dir=.
maven.jar.override=on
maven.jar.commons-dude=${maven.repo.local}/commons-logging/jars/commons-logging-1.0.3.jar

7
eclipse/src/plugin-test/project.xml
View File

@ -53,6 +53,13 @@
</developers>
<dependencies>
<dependency>
<groupId>facts</groupId>
<artifactId>commons-dude</artifactId>
<version>1.0.3</version>
<type>jar</type>
<properties/>
</dependency>
<dependency>
<id>maven</id>
<version>beta-8</version>

2
eclipse/xdocs/changes.xml
View File

@ -25,7 +25,7 @@
</properties>
<body>
<release version="1.9" date="in cvs">
<action dev="epugh" type="fix" issue="MPECLIPSE-38">Jar overrides are not supported. Unit test to verify fix</action>
<action dev="epugh" type="fix" issue="MPECLIPSE-38">Jar overrides are now properly supported.</action>
</release>
<release version="1.8" date="2004-08-14">
<action dev="epugh" type="fix" issue="MPECLIPSE-37" due-to="Felipe Leme">Fixed a 'race condition' where Cactus dependency is added twice to .classpath.</action>