maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aherit...@apache.org
Subject svn commit: r531495 - in /maven/maven-1/plugins/trunk/plugin: plugin.jelly xdocs/changes.xml
Date Mon, 23 Apr 2007 15:11:02 GMT
Author: aheritier
Date: Mon Apr 23 08:11:00 2007
New Revision: 531495

URL: http://svn.apache.org/viewvc?view=rev&rev=531495
Log:
assert:assertPluginAvailable : Fix error (NoSuchElementException) if the minimum release number
has less elements than the version number installed.

Modified:
    maven/maven-1/plugins/trunk/plugin/plugin.jelly
    maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/plugin/plugin.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/plugin/plugin.jelly?view=diff&rev=531495&r1=531494&r2=531495
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/plugin/plugin.jelly Mon Apr 23 08:11:00 2007
@@ -165,8 +165,12 @@
               <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"/>
+                <j:if test="${!minReleaseToHaveTokensIter.hasNext()}">
+                  <!-- There are more elements in the installed version than in the version
to have -->
+                  <!-- For example 1.7.1 and 1.7 -->
+                  <!-- We are in the case where previous versions numbers are already
tested -->
+                  <!-- Thus it's a minor increment -->
+                  <j:set var="testOk" value="true"/>
                   <j:break/>
                 </j:if>
                 <j:set var="numberToHave" value="${minReleaseToHaveTokensIter.next()}"/>
@@ -202,7 +206,7 @@
         </j:otherwise>    
       </j:choose>
   
-      <j:if test="${!testFailed and !testOk and minReleaseToHaveTokens.iterator().hasNext()}">
+      <j:if test="${!testFailed and !testOk and minReleaseToHaveTokensIter.hasNext()}">
         <!-- A minor release is missing. For example : 1.10 < 1.10.2 -->
         <j:set var="errorSentence" value="Currently the plugin ${pluginToTest} v${installedRelease}
is installed."/>
         <j:set var="testFailed" value="true"/>    

Modified: maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml?view=diff&rev=531495&r1=531494&r2=531495
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml Mon Apr 23 08:11:00 2007
@@ -23,6 +23,7 @@
   </properties>
   <body>
     <release version="1.7.1-SNAPSHOT" date="In SVN">
+      <action dev="aheritier" type="fix">assert:assertPluginAvailable : Fix error (NoSuchElementException)
if the minimum release number has less elements than the version number installed.</action>
       <action dev="aheritier" type="update">Don't check that a given plugin version
is available in the bootstrap.</action>
       <action dev="aheritier" type="update">Update dependencies to unify them between
plugins. The following dependencies are updated : commons-jelly-tags-interaction v1.0 to v1.1,
jaxen v1.0-FCS-full to 1.1-beta-9. The following dependencies are removed : saxpath.</action>
       <action dev="aheritier" type="update" issue="MAVEN-1753">Upgrade to Xerces 2.8.0.
Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for
xerces.</action>



Mime
View raw message