Replace String comparison by Integer comparison !! It's why I added this tag ;-)

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@280358 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier 2005-09-12 15:50:17 +00:00
parent 1e69156909
commit b793ed192e

View File

@ -398,17 +398,23 @@
<j:break/>
</j:if>
<j:set var="numberToHave" value="${minReleaseToHaveTokensIter.next()}"/>
<j:invokeStatic var="numberInstalledInteger" className="java.lang.Integer" method="valueOf">
<j:arg value="${numberInstalled}"/>
</j:invokeStatic>
<j:invokeStatic var="numberToHaveInteger" className="java.lang.Integer" method="valueOf">
<j:arg value="${numberToHave}"/>
</j:invokeStatic>
<j:choose>
<j:when test="${numberInstalled.compareTo(numberToHave) lt 0}">
<!-- ${numberInstalled} is less than ${numberToHave} => fail -->
<j:when test="${numberInstalledInteger.compareTo(numberToHaveInteger) lt 0}">
<!--<echo>${numberInstalledInteger} is less than ${numberToHaveInteger}</echo>-->
<j:set var="testFailed" value="true"/>
<j:break/>
</j:when>
<j:when test="${numberInstalled.compareTo(numberToHave) eq 0}">
<!-- ${numberInstalled} is equal than ${numberToHave} => continue to test -->
<j:when test="${numberInstalledInteger.compareTo(numberToHaveInteger) eq 0}">
<!--<echo>${numberInstalledInteger} is equal than ${numberToHaveInteger}</echo>-->
</j:when>
<j:when test="${numberInstalled.compareTo(numberToHave) gt 0}">
<!-- ${numberInstalled} is greater than ${numberToHave} => good -->
<j:when test="${numberInstalledInteger.compareTo(numberToHaveInteger) gt 0}">
<!--<echo>${numberInstalledInteger} is greater than ${numberToHaveInteger}</echo>-->
<j:break/>
</j:when>
</j:choose>
@ -416,12 +422,12 @@
</j:when>
<j:otherwise>
<j:set var="testFailed" value="true"/>
</j:otherwise>
</j:otherwise>
</j:choose>
<j:if test="${testFailed}">
<ant:fail>
- BE CAREFUL
-
=======================================================================================
Must have ${pluginToTest} plugin v${minReleaseToHave} installed to use this version of the plugin.
Try: maven plugin:download -DgroupId=maven -DartifactId=${pluginToTest} -Dversion=${minReleaseToHave}