Author: ltheussl
Date: Thu May 17 06:38:22 2007
New Revision: 538917
URL: http://svn.apache.org/viewvc?view=rev&rev=538917
Log:
PR: MPTEST-63, MPTEST-64
Fix memory leak and performance degradation in test plugin 1.8.
Modified:
maven/maven-1/plugins/trunk/test/plugin.jelly
maven/maven-1/plugins/trunk/test/project.xml
maven/maven-1/plugins/trunk/test/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/test/plugin.jelly
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/test/plugin.jelly?view=diff&rev=538917&r1=538916&r2=538917
==============================================================================
--- maven/maven-1/plugins/trunk/test/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/test/plugin.jelly Thu May 17 06:38:22 2007
@@ -64,9 +64,9 @@
<pathelement path="${plugin.getDependencyPath('junit')}"/>
<j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')
and
!context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes')
}">
<pathelement
location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
</j:if>
- <pathelement
path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement
location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
</classpath>
<src>
<path refid="maven.test.compile.src.set"/>
@@ -186,10 +186,10 @@
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
<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:xml-apis')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
</j:if>
- <pathelement
path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement
path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
<j:if test="${not
empty(context.getVariable('maven.test.classpath'))}">
<pathelement path="${maven.test.classpath}"/>
</j:if>
@@ -256,10 +256,10 @@
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
<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:xml-apis')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
</j:if>
- <pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement
path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
<j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
<pathelement path="${maven.test.classpath}"/>
</j:if>
@@ -342,10 +342,10 @@
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
<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:xml-apis')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
</j:if>
- <pathelement
path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement
path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
<j:if test="${not
empty(context.getVariable('maven.test.classpath'))}">
<pathelement path="${maven.test.classpath}"/>
</j:if>
@@ -454,10 +454,10 @@
<path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/>
<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:xml-apis')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
+ <pathelement
location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
</j:if>
- <pathelement
path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
- <pathelement
path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
<j:if test="${not
empty(context.getVariable('maven.test.classpath'))}">
<pathelement path="${maven.test.classpath}"/>
</j:if>
Modified: maven/maven-1/plugins/trunk/test/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/test/project.xml?view=diff&rev=538917&r1=538916&r2=538917
==============================================================================
--- maven/maven-1/plugins/trunk/test/project.xml (original)
+++ maven/maven-1/plugins/trunk/test/project.xml Thu May 17 06:38:22 2007
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-test-plugin</id>
<name>Maven Test Plugin</name>
- <currentVersion>1.8.1</currentVersion>
+ <currentVersion>1.8.2-SNAPSHOT</currentVersion>
<description>Run JUnit tests.</description>
<shortDescription>Run JUnit tests</shortDescription>
<versions>
Modified: maven/maven-1/plugins/trunk/test/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/test/xdocs/changes.xml?view=diff&rev=538917&r1=538916&r2=538917
==============================================================================
--- maven/maven-1/plugins/trunk/test/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/test/xdocs/changes.xml Thu May 17 06:38:22 2007
@@ -24,6 +24,13 @@
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
+ <release version="1.8.2-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="fix">
+ <description>Memory leak and performance degradation in test plugin
1.8.</description>
+ <fixes issue="MPTEST-63"/>
+ <fixes issue="MPTEST-64"/>
+ </action>
+ </release>
<release version="1.8.1" date="2007-05-07">
<action dev="ltheussl" type="update" issue="MPTEST-66">Document a
backward-compat problem affecting version 1.8 of the plugin.</action>
<action dev="ltheussl" type="add" issue="MPTEST-71">New property to halt
a build on test failures but after all tests have been run.</action>
