Fix test on windows which didn't work because ${mOneDotOnePath}=c:\XXX\YYY\ZZZ\maven-1.1-RC1-20061029/lib/maven.jar and in the .classpath we have something like c:\XXX\YYY\ZZZ\maven-1.1-RC1-20061029\lib\maven.jar
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@480069 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -141,11 +141,12 @@
|
||||
<!-- maven.jar is now overrided as from maven 1.1-RC1 so break the test here -->
|
||||
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/maven/jars/maven.jar')])"/>
|
||||
<j:if test="${count == 0}">
|
||||
<j:set var="mOneDotOnePath" value="${maven.home}/lib/maven.jar"/>
|
||||
<u:file var="mOneDotOneJar" name="${maven.home}/lib/maven.jar" />
|
||||
<j:set var="mOneDotOnePath" value="${mOneDotOneJar.absolutePath}"/>
|
||||
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,$mOneDotOnePath)])"/>
|
||||
</j:if>
|
||||
<assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="maven.jar.override didn't work"/>
|
||||
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar')])"/>
|
||||
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar')])"/>
|
||||
<assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="override by jar tag not found"/>
|
||||
|
||||
</goal>
|
||||
|
||||
Reference in New Issue
Block a user