brett 2004/05/19 05:31:35
Modified: test plugin.jelly project.xml
test/xdocs changes.xml
Log:
fix classloader issues
Revision Changes Path
1.31 +20 -10 maven-plugins/test/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/test/plugin.jelly,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- plugin.jelly 25 Apr 2004 02:24:36 -0000 1.30
+++ plugin.jelly 19 May 2004 12:31:35 -0000 1.31
@@ -58,8 +58,10 @@
<pathelement path="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
- <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
- <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+ <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
+ <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
+ <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+ </j:if>
</classpath>
<src>
<path refid="maven.test.compile.src.set"/>
@@ -136,8 +138,10 @@
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
- <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
- <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+ <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
+ <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
+ <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+ </j:if>
</classpath>
<batchtest todir="${maven.test.reportsDirectory}">
<fileset dir="${maven.test.searchdir}">
@@ -190,8 +194,10 @@
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
- <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
- <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+ <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
+ <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
+ <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+ </j:if>
</classpath>
<arg value="-noloading"/>
</java>
@@ -249,8 +255,10 @@
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
- <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
- <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+ <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
+ <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
+ <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+ </j:if>
</classpath>
<test name="${testcase}" todir="${maven.test.reportsDirectory}"/>
@@ -326,8 +334,10 @@
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
- <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
- <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+ <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
+ <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
+ <pathelement path="${plugin.getDependencyPath('xerces')}"/>
+ </j:if>
</classpath>
<batchtest todir="${maven.test.reportsDirectory}">
1.29 +13 -13 maven-plugins/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/test/project.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- project.xml 16 May 2004 01:19:14 -0000 1.28
+++ project.xml 19 May 2004 12:31:35 -0000 1.29
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-test-plugin</id>
<name>Maven Test Plug-in</name>
- <currentVersion>1.6</currentVersion>
+ <currentVersion>1.6.1-SNAPSHOT</currentVersion>
<description>Run JUnit tests. Requires Maven 1.0 RC2.</description>
<shortDescription>Run JUnit tests</shortDescription>
<url>http://maven.apache.org/reference/plugins/test/</url>
@@ -34,6 +34,18 @@
<developerConnection>scm:cvs:ext:[EMAIL
PROTECTED]:/home/cvs:maven-plugins/test/</developerConnection>
<url>http://cvs.apache.org/viewcvs/maven-plugins/test/</url>
</repository>
+ <versions>
+ <version>
+ <id>1.5</id>
+ <name>1.5</name>
+ <tag>MAVEN_TEST_1_5</tag>
+ </version>
+ <version>
+ <id>1.6</id>
+ <name>1.6</name>
+ <tag>MAVEN_TEST_1_6</tag>
+ </version>
+ </versions>
<developers>
<developer>
<name>Vincent Massol</name>
@@ -73,16 +85,4 @@
</properties>
</dependency>
</dependencies>
- <versions>
- <version>
- <id>1.5</id>
- <name>1.5</name>
- <tag>MAVEN_TEST_1_5</tag>
- </version>
- <version>
- <id>1.6</id>
- <name>1.6</name>
- <tag>MAVEN_TEST_1_6</tag>
- </version>
- </versions>
</project>
1.17 +3 -0 maven-plugins/test/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/test/xdocs/changes.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- changes.xml 16 May 2004 01:19:14 -0000 1.16
+++ changes.xml 19 May 2004 12:31:35 -0000 1.17
@@ -24,6 +24,9 @@
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
+ <release version="1.6.1" date="in CVS">
+ <action dev="brett" type="fix">only add xml-apis to classpath when forking to
avoid classloader issues</action>
+ </release>
<release version="1.6" date="2004-05-15">
<action dev="brett" type="fix" issue="MPTEST-27" due-to="joseph
benavidez">add maven.junit.envvars property</action>
<action dev="brett" type="fix" issue="MPTEST-26">add maven.junit.jvm
property</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
