Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll back last commit, just remove escapeText attribute

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@354250 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2005-12-06 01:06:58 +00:00
parent f1bedba953
commit 2113113361
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/plugin.jelly
View File

@ -114,8 +114,6 @@
<maven:param-check value="${minRelease}" fail="true" message="'minRelease' 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"/> <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}"/> <j:set var="pluginToTest" value="${artifactId}"/>
<!-- Remove SNAPSHOT --> <!-- Remove SNAPSHOT -->
@ -154,8 +152,8 @@
<!-- If not equals we use a more complex algorithm --> <!-- If not equals we use a more complex algorithm -->
<!-- Tokenify --> <!-- Tokenify -->
<j:set var="installedReleaseTokens" value="${stringUtils.split(installedRelease, '.')}"/> <u:tokenize var="installedReleaseTokens" delim=".">${installedRelease}</u:tokenize>
<j:set var="minReleaseToHaveTokens" value="${stringUtils.split(minReleaseToHave, '.')}"/> <u:tokenize var="minReleaseToHaveTokens" delim=".">${minReleaseToHave}</u:tokenize>
<j:set var="minReleaseToHaveTokensIter" value="${minReleaseToHaveTokens.iterator()}"/> <j:set var="minReleaseToHaveTokensIter" value="${minReleaseToHaveTokens.iterator()}"/>
@ -173,7 +171,7 @@
</j:invokeStatic> </j:invokeStatic>
<j:choose> <j:choose>
<j:when test="${numberInstalledInteger.compareTo(numberToHaveInteger) lt 0}"> <j:when test="${numberInstalledInteger.compareTo(numberToHaveInteger) lt 0}">
<j:set var="errorSentence" value="Actually the plugin ${pluginToTest} v${installedRelease} is installed."/> <j:set var="errorSentence" value="Currently the plugin ${pluginToTest} v${installedRelease} is installed."/>
<j:set var="testFailed" value="true"/> <j:set var="testFailed" value="true"/>
<j:break/> <j:break/>
</j:when> </j:when>
@ -182,9 +180,9 @@
<j:when test="${numberInstalledInteger.compareTo(numberToHaveInteger) gt 0}"> <j:when test="${numberInstalledInteger.compareTo(numberToHaveInteger) gt 0}">
<j:set var="testOk" value="true"/> <j:set var="testOk" value="true"/>
<j:break/> <j:break/>
</j:when> </j:when>
</j:choose> </j:choose>
</j:forEach> </j:forEach>
</j:when> </j:when>
<j:otherwise> <j:otherwise>
<j:set var="testOk" value="true"/> <j:set var="testOk" value="true"/>
@ -192,14 +190,14 @@
</j:choose> </j:choose>
</j:when> </j:when>
<j:otherwise> <j:otherwise>
<j:set var="errorSentence" value="Actually the plugin ${pluginToTest} isn't installed."/> <j:set var="errorSentence" value="Currently the plugin ${pluginToTest} isn't installed."/>
<j:set var="testFailed" value="true"/> <j:set var="testFailed" value="true"/>
</j:otherwise> </j:otherwise>
</j:choose> </j:choose>
<j:if test="${!testFailed and !testOk and minReleaseToHaveTokens.iterator().hasNext()}"> <j:if test="${!testFailed and !testOk and minReleaseToHaveTokens.iterator().hasNext()}">
<!-- A minor release is missing. For example : 1.10 < 1.10.2 --> <!-- A minor release is missing. For example : 1.10 < 1.10.2 -->
<j:set var="errorSentence" value="Actually the plugin ${pluginToTest} v${installedRelease} is installed."/> <j:set var="errorSentence" value="Currently the plugin ${pluginToTest} v${installedRelease} is installed."/>
<j:set var="testFailed" value="true"/> <j:set var="testFailed" value="true"/>
</j:if> </j:if>