epugh 2004/09/24 05:22:15
Modified: eclipse/src/plugin-test project.xml maven.xml
eclipse/xdocs changes.xml
Log:
MPECLIPSE-38 Jar overrides are not supported. Unit test to verify fix
Revision Changes Path
1.7 +5 -0 maven-plugins/eclipse/src/plugin-test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/src/plugin-test/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 10 Aug 2004 07:41:16 -0000 1.6
+++ project.xml 24 Sep 2004 12:22:15 -0000 1.7
@@ -54,6 +54,11 @@
<dependencies>
<dependency>
+ <id>maven</id>
+ <version>beta-8</version>
+ <jar>maven.jar</jar>
+ </dependency>
+ <dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>20030211.142705</version>
1.11 +14 -1 maven-plugins/eclipse/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/src/plugin-test/maven.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven.xml 10 Aug 2004 07:41:17 -0000 1.10
+++ maven.xml 24 Sep 2004 12:22:15 -0000 1.11
@@ -20,7 +20,7 @@
xmlns:u="jelly:util"
xmlns:x="jelly:xml">
- <goal name="testPlugin"
prereqs="test-eclipse,test-natures,test-builders,test-natures-and-builders,test-classpath-has-generated-source">
+ <goal name="testPlugin"
prereqs="test-eclipse,test-natures,test-builders,test-natures-and-builders,test-classpath-has-generated-source,test-classpath-has-overridden-jar">
</goal>
<goal name="test-init">
@@ -114,5 +114,18 @@
<assert:assertEquals expected="3" value="${count.intValue().toString()}"/>
</goal>
+
+ <goal name="test-classpath-has-overridden-jar">
+ <attainGoal name="test-init"/>
+ <attainGoal name="eclipse"/>
+
+ <assert:assertFileExists file="${dotClasspath}" />
+
+ <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()}"/>
+
+ </goal>
</project>
1.29 +1 -0 maven-plugins/eclipse/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/eclipse/xdocs/changes.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- changes.xml 14 Aug 2004 19:43:30 -0000 1.28
+++ changes.xml 24 Sep 2004 12:22:15 -0000 1.29
@@ -25,6 +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>
</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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
