dion 2003/09/24 00:42:45
Modified: src/plugins-build/test/xdocs changes.xml
src/plugins-build/test plugin.jelly
Log:
Fix similar to MAVEN-309
Revision Changes Path
1.5 +4 -0 maven/src/plugins-build/test/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/test/xdocs/changes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changes.xml 19 Sep 2003 16:26:50 -0000 1.4
+++ changes.xml 24 Sep 2003 07:42:45 -0000 1.5
@@ -7,6 +7,10 @@
<body>
<release version="1.5" date="in CVS">
+ <action dev="dion" type="update">
+ Apply MAVEN-309. Reorganise classpaths so that it's test, build,
dependencies
+ and then JUnit
+ </action>
<action dev="jstrachan" type="fix">
You can now specify whether the source (java) or classes (class) files
are searched when using the test plugin via the property:
1.20 +9 -8 maven/src/plugins-build/test/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/test/plugin.jelly,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plugin.jelly 21 Sep 2003 09:14:56 -0000 1.19
+++ plugin.jelly 24 Sep 2003 07:42:45 -0000 1.20
@@ -37,6 +37,7 @@
<setProperty name="source" value="${maven.test.source}" />
</j:if>
<classpath>
+ <pathelement path="${maven.test.dest}"/>
<pathelement path="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
@@ -104,9 +105,9 @@
<formatter type="xml"/>
<formatter type="plain" usefile="${maven.junit.usefile}"/>
<classpath>
- <path refid="maven.dependency.classpath"/>
- <pathelement location="${maven.build.dest}"/>
<pathelement location="${maven.test.dest}"/>
+ <pathelement location="${maven.build.dest}"/>
+ <path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
</classpath>
<batchtest todir="${maven.test.reportsDirectory}">
@@ -153,9 +154,9 @@
<jvmarg value="${somejvmarg}"/>
</j:forEach>
<classpath>
- <path refid="maven.dependency.classpath"/>
- <pathelement location="${maven.build.dest}"/>
<pathelement location="${maven.test.dest}"/>
+ <pathelement location="${maven.build.dest}"/>
+ <path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
</classpath>
<arg value="-noloading"/>
@@ -205,9 +206,9 @@
<formatter type="plain" usefile="true"/>
<classpath>
- <path refid="maven.dependency.classpath"/>
- <pathelement location="${maven.build.dest}"/>
<pathelement location="${maven.test.dest}"/>
+ <pathelement location="${maven.build.dest}"/>
+ <path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
</classpath>
@@ -270,9 +271,9 @@
<formatter type="plain" usefile="true"/>
<classpath>
- <path refid="maven.dependency.classpath"/>
- <pathelement location="${maven.build.dest}"/>
<pathelement location="${maven.test.dest}"/>
+ <pathelement location="${maven.build.dest}"/>
+ <path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
</classpath>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
