Use commons-lang for string tokenizing: escapeText attribute does not work in maven 1.0.2
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@354227 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
1 parent
9bbeabd840
commit
f1bedba953
1 file changed
+8
-5
+8
-5
@@ -113,7 +113,9 @@
|
||||
<maven:param-check value="${artifactId}" fail="true" message="'artifactId' must be specified"/>
|
||||
<maven:param-check value="${minRelease}" fail="true" message="'minRelease' must be specified"/>
|
||||
<maven:param-check value="${neededBy}" fail="true" message="'neededBy' must be specified"/>
|
||||
|
||||
|
||||
<j:useBean var="stringUtils" class="org.apache.commons.lang.StringUtils"/>
|
||||
|
||||
<j:set var="pluginToTest" value="${artifactId}"/>
|
||||
|
||||
<!-- Remove SNAPSHOT -->
|
||||
@@ -150,12 +152,13 @@
|
||||
<j:choose>
|
||||
<j:when test="${!installedRelease.equals(minReleaseToHave)}">
|
||||
<!-- If not equals we use a more complex algorithm -->
|
||||
|
||||
|
||||
<!-- Tokenify -->
|
||||
<u:tokenize var="installedReleaseTokens" delim="." escapeText="true">${installedRelease}</u:tokenize>
|
||||
<u:tokenize var="minReleaseToHaveTokens" delim="." escapeText="true">${minReleaseToHave}</u:tokenize>
|
||||
<j:set var="installedReleaseTokens" value="${stringUtils.split(installedRelease, '.')}"/>
|
||||
<j:set var="minReleaseToHaveTokens" value="${stringUtils.split(minReleaseToHave, '.')}"/>
|
||||
|
||||
<j:set var="minReleaseToHaveTokensIter" value="${minReleaseToHaveTokens.iterator()}"/>
|
||||
|
||||
|
||||
<j:forEach var="numberInstalled" items="${installedReleaseTokens}">
|
||||
<j:if test="${!minReleaseToHaveTokens.iterator().hasNext()}">
|
||||
<j:set var="testFailed" value="true"/>
|
||||
|
||||
Reference in new issue
Block a user