[Maven-plugins-cvs] cvs commit: maven-plugins/sourceforge plugin.jelly

[Jeff J. <jef...@us...>]

jeffjensen    07/11/29 19:51:31

  Modified:    sourceforge/xdocs changes.xml
               sourceforge plugin.jelly
  Log:
  Apply fix James Dempsey for bug 1840932.
  
  Revision  Changes    Path
  1.12      +3 -0      maven-plugins/sourceforge/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/sourceforge/xdocs/changes.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- changes.xml	21 Aug 2006 23:41:18 -0000	1.11
  +++ changes.xml	30 Nov 2007 03:51:31 -0000	1.12
  @@ -13,6 +13,9 @@
       -->
   
       <release version="1.4-SNAPSHOT" date="in CVS">
  +      <action dev="jeffjensen" type="fix" issue="1840932" due-to="James Dempsey">
  +        sourceforge:changes fails under Maven 1.1
  +      </action>
         <action dev="scoleborne" type="fix" issue="1363121" due-to="notzippy">
           Trying to fix due to sf html changes.
         </action>
  
  
  
  1.11      +9 -11     maven-plugins/sourceforge/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/sourceforge/plugin.jelly,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- plugin.jelly	9 Jan 2006 22:59:14 -0000	1.10
  +++ plugin.jelly	30 Nov 2007 03:51:31 -0000	1.11
  @@ -78,19 +78,17 @@
   
     <goal name="sourceforge:changes" prereqs="sourceforge:init"
       description="Creates the CHANGES.txt file">
  -
  +    
       <!-- Generates the changes.txt file -->
       
  -    <util:available file="xdocs/changes.xml">
  -      <x:parse var="root" xml="xdocs/changes.xml" />
  -      <j:set var="version" value="${maven.sourceforge.project.version}" />
  -      <ant:mkdir dir="${maven.dist.dir}" />
  -    
  -      <velocity:merge
  -        name="${maven.sourceforge.project.changeNotes}"
  -        basedir="${plugin.resources}/templates"
  -        template="changes.vm"
  -      />
  +    <util:available file="${basedir}/xdocs/changes.xml">
  +      <util:file var="inputFile" name="${basedir}/xdocs/changes.xml"/>
  +      <x:parse var="root" xml="${inputFile}"/>
  +      <j:set var="version" value="${maven.sourceforge.project.version}"/>
  +      <ant:mkdir dir="${maven.dist.dir}"/>
  +      
  +      <velocity:merge name="${maven.sourceforge.project.changeNotes}"
  +        basedir="${plugin.resources}/templates" template="changes.vm"/>
       </util:available>
       
     </goal>