Author: brett
Date: Sat Sep 3 00:01:37 2005
New Revision: 267430
URL: http://svn.apache.org/viewcvs?rev=267430&view=rev
Log:
PR: MPTEST-55
Submitted by: Eric Hartmann
Reviewed by: Brett Porter
add the ability to not include the XML APIs and xerces when forking tests
Modified:
maven/maven-1/plugins/trunk/test/plugin.jelly
maven/maven-1/plugins/trunk/test/plugin.properties
maven/maven-1/plugins/trunk/test/project.xml
maven/maven-1/plugins/trunk/test/xdocs/changes.xml
maven/maven-1/plugins/trunk/test/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/test/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/plugin.jelly?rev=267430&r1=267429&r2=267430&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/test/plugin.jelly Sat Sep 3 00:01:37 2005
@@ -58,7 +58,7 @@
<pathelement path="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
- <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
+ <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')
and
!context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes')
}">
<pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('xerces')}"/>
</j:if>
@@ -159,7 +159,7 @@
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
- <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
+ <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')
and
!context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes')
}">
<pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('xerces')}"/>
</j:if>
@@ -215,7 +215,7 @@
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
- <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
+ <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')
and
!context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes')
}">
<pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('xerces')}"/>
</j:if>
@@ -277,7 +277,7 @@
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
- <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
+ <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')
and
!context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes')
}">
<pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('xerces')}"/>
</j:if>
@@ -362,7 +362,7 @@
<pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
- <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
+ <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')
and
!context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes')
}">
<pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('xerces')}"/>
</j:if>
Modified: maven/maven-1/plugins/trunk/test/plugin.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/plugin.properties?rev=267430&r1=267429&r2=267430&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/test/plugin.properties Sat Sep 3 00:01:37 2005
@@ -33,3 +33,4 @@
maven.test.dest = ${maven.build.dir}/test-classes
maven.test.reportsDirectory = ${maven.build.dir}/test-reports
maven.test.skip = false
+maven.test.excludeXmlApis = no
Modified: maven/maven-1/plugins/trunk/test/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/project.xml?rev=267430&r1=267429&r2=267430&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/project.xml (original)
+++ maven/maven-1/plugins/trunk/test/project.xml Sat Sep 3 00:01:37 2005
@@ -22,7 +22,7 @@
<pomVersion>3</pomVersion>
<id>maven-test-plugin</id>
<name>Maven Test Plug-in</name>
- <currentVersion>1.7</currentVersion>
+ <currentVersion>1.7.1-SNAPSHOT</currentVersion>
<description>Run JUnit tests.</description>
<shortDescription>Run JUnit tests</shortDescription>
<url>http://maven.apache.org/reference/plugins/test/</url>
Modified: maven/maven-1/plugins/trunk/test/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/xdocs/changes.xml?rev=267430&r1=267429&r2=267430&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/test/xdocs/changes.xml Sat Sep 3 00:01:37 2005
@@ -23,6 +23,9 @@
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
+ <release version="1.7.1-SNAPSHOT" date="in SVN">
+ <action dev="brett" type="add" due-to="Eric Hartmann"
issue="MPTEST-55">Add maven.test.excludeXmlApis property to avoid duplicated
Xerces</action>
+ </release>
<release version="1.7" date="2005-08-09">
<action dev="carlos" type="add">Added maven.junit.forkmode
property</action>
<action dev="carlos" type="update">Allow multiple patterns in
testmatchpattern and testnotmatchpattern</action>
Modified: maven/maven-1/plugins/trunk/test/xdocs/properties.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/xdocs/properties.xml?rev=267430&r1=267429&r2=267430&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/test/xdocs/properties.xml Sat Sep 3 00:01:37
2005
@@ -198,6 +198,15 @@
</source>
</td>
</tr>
+ <tr>
+ <td>maven.test.excludeXmlApis</td>
+ <td>Yes</td>
+ <td>
+ If set to yes, the XML APIs will not be added to the list of
libraries used for your test cases
+ when forked. This should be used when you provide your own XML
APIs library. By default, it is
+ <code>no</code>.
+ </td>
+ </tr>
<tr>
<td>testmatchpattern</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
