From d1fdb633a49091ee51ce47376945c95252a7f71d Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 28 Oct 2005 00:09:42 +0000
Subject: [PATCH] MPMULTICHANGES-3 : Add another column to the report that
 lists the value of currentVersion. Apply patch with some modifications from
 Jon Strayer

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@328986 13f79535-47bb-0310-9956-ffa450edef68
---
 multichanges/plugin.jelly                      |  3 +++
 multichanges/src/plugin-resources/releases.jsl | 10 ++++++++++
 multichanges/xdocs/changes.xml                 |  3 ++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/multichanges/plugin.jelly b/multichanges/plugin.jelly
index c5a8afd4..ea0386bc 100644
--- a/multichanges/plugin.jelly
+++ b/multichanges/plugin.jelly
@@ -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>
diff --git a/multichanges/src/plugin-resources/releases.jsl b/multichanges/src/plugin-resources/releases.jsl
index 380ee01d..2f96e126 100644
--- a/multichanges/src/plugin-resources/releases.jsl
+++ b/multichanges/src/plugin-resources/releases.jsl
@@ -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']"/>
@@ -100,6 +107,9 @@
                 <td>
                   <x:expr select="$project/@date"/>
                 </td>
+                <td>
+                  <x:expr select="$project/@nextVersion"/>
+                </td>
               </tr>
             </j:forEach>
           </table>
diff --git a/multichanges/xdocs/changes.xml b/multichanges/xdocs/changes.xml
index e6104d5f..3f5c6163 100644
--- a/multichanges/xdocs/changes.xml
+++ b/multichanges/xdocs/changes.xml
@@ -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>