You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2005/10/28 02:09:49 UTC

svn commit: r328986 - in /maven/maven-1/plugins/trunk/multichanges: plugin.jelly src/plugin-resources/releases.jsl xdocs/changes.xml

Author: aheritier
Date: Thu Oct 27 17:09:42 2005
New Revision: 328986

URL: http://svn.apache.org/viewcvs?rev=328986&view=rev
Log:
MPMULTICHANGES-3 : Add another column to the report that lists the value of currentVersion.
Apply patch with some modifications from Jon Strayer

Modified:
    maven/maven-1/plugins/trunk/multichanges/plugin.jelly
    maven/maven-1/plugins/trunk/multichanges/src/plugin-resources/releases.jsl
    maven/maven-1/plugins/trunk/multichanges/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/multichanges/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/multichanges/plugin.jelly?rev=328986&r1=328985&r2=328986&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/multichanges/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/multichanges/plugin.jelly Thu Oct 27 17:09:42 2005
@@ -62,6 +62,9 @@
             <x:attribute name="url">
               ${reactorProject.url}
             </x:attribute>
+            <x:attribute name="nextVersion">
+              ${reactorProject.currentVersion}
+            </x:attribute>
             <util:file var="changesAsFile" 
                 name="${reactorProject.context.getVariable('maven.docs.src')}/changes.xml"/>
             <j:choose>

Modified: maven/maven-1/plugins/trunk/multichanges/src/plugin-resources/releases.jsl
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/multichanges/src/plugin-resources/releases.jsl?rev=328986&r1=328985&r2=328986&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/multichanges/src/plugin-resources/releases.jsl (original)
+++ maven/maven-1/plugins/trunk/multichanges/src/plugin-resources/releases.jsl Thu Oct 27 17:09:42 2005
@@ -31,6 +31,7 @@
               <th>Project name</th>
               <th>Latest version</th>
               <th>Released date</th>
+              <th>Next version</th>
             </tr>
             <maven:get var="maven.multiproject.aggregateDir" plugin="maven-multiproject-plugin" property="maven.multiproject.aggregateDir"/>
             <maven:get var="maven.multiproject.navigation" plugin="maven-multiproject-plugin" property="maven.multiproject.navigation"/>
@@ -57,6 +58,9 @@
                 <td>
                   <x:expr select="$project/@date"/>
                 </td>
+                <td>
+                  <x:expr select="$project/@nextVersion"/>
+                </td>
               </tr>
             </j:forEach>
             <x:set var="projects" sort="@date" descending="true" select="project[@date = 'Not released']"/>
@@ -78,6 +82,9 @@
                 <td>
                   <x:expr select="$project/@date"/>
                 </td>
+                <td>
+                  <x:expr select="$project/@nextVersion"/>
+                </td>
               </tr>
             </j:forEach>
             <x:set var="projects" sort="@date" descending="true" select="project[@date = 'No information available']"/>
@@ -99,6 +106,9 @@
                 </td>
                 <td>
                   <x:expr select="$project/@date"/>
+                </td>
+                <td>
+                  <x:expr select="$project/@nextVersion"/>
                 </td>
               </tr>
             </j:forEach>

Modified: maven/maven-1/plugins/trunk/multichanges/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/multichanges/xdocs/changes.xml?rev=328986&r1=328985&r2=328986&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/multichanges/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/multichanges/xdocs/changes.xml Thu Oct 27 17:09:42 2005
@@ -25,7 +25,8 @@
   </properties>
   <body>
     <release version="1.2-SNAPSHOT" date="in SCM">
-      <action dev="aheriiter" type="fix" issue="MPMULTICHANGES-1">Links always used maven.multiproject.aggregateDir even if maven.multiproject.navigation=independent.</action>
+      <action dev="aheritier" type="add" issue="MPMULTICHANGES-3" due-to="Jon Strayer">Add another column to the report that lists the value of currentVersion.</action>
+      <action dev="aheritier" type="fix" issue="MPMULTICHANGES-1">Links always used maven.multiproject.aggregateDir even if maven.multiproject.navigation=independent.</action>
       <action dev="carlos" type="add">Linked project names and releases with download pages and announcements</action>
     </release>
     <release version="1.1" date="2004-05-15"></release>