Author: sebb
Date: Sat May 5 09:23:32 2012
New Revision: 1334357
URL: http://svn.apache.org/viewvc?rev=1334357&view=rev
Log:
Generalise indent handling to any JIRA id; allow for 4 digit issue numbers
Modified:
commons/proper/commons-parent/trunk/src/changes/release-notes.vm
Modified: commons/proper/commons-parent/trunk/src/changes/release-notes.vm
URL:
http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/src/changes/release-notes.vm?rev=1334357&r1=1334356&r2=1334357&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/src/changes/release-notes.vm (original)
+++ commons/proper/commons-parent/trunk/src/changes/release-notes.vm Sat May 5
09:23:32 2012
@@ -17,10 +17,10 @@
##
Apache ${project.name} ${version} RELEASE NOTES
-The ${developmentTeam} is pleased to announce the release of ${project.name}
${version}
+The ${developmentTeam} is pleased to announce the release of ${finalName}
$introduction.replaceAll("(?<!\015)\012", "
-")
+").replaceAll("(?m)^ +","")
## N.B. the available variables are described here:
##
http://maven.apache.org/plugins/maven-changes-plugin/examples/using-a-custom-announcement-template.html
@@ -29,108 +29,73 @@ $introduction.replaceAll("(?<!\015)\012"
$release.description.replaceAll(" ", "
")
-#if ($release.getActions().size() == 0)
-No changes defined in this version.
-#else
-Changes in this version include:
-
-## indent to be used if there is no issue attribute.
-## should be the same as the indent in the changes.xml file
-## less 2 spaces for the 'o' and trailing space
-#set($indent=' ')
-#if ($release.getActions('add').size() !=0)
-
-New features:
-#foreach($actionItem in $release.getActions('add'))
+## set up indent sizes. Only change indent1
+#set($props=${project.properties})
+#set($jiralen=$props.get("commons.jira.id").length())
+## indent1 = POOL-nnnn:
+#set($blanklen=$jiralen+6)## +6 for "-nnnn:"
+## must be at least as long as the longest JIRA id
+#set($blanks=" ")
+#set($indent1=$blanks.substring(0,$blanklen))
+## indent2 allows for issue wrapper
+#set($indent2="$indent1 ")
+##
+#macro ( processaction )
## Use replaceAll to fix up LF-only line ends on Windows.
#set($action=$actionItem.getAction().replaceAll("\n","
"))
+## Fix up indentation for multi-line action descriptions
+#set($action=$action.replaceAll("(?m)^ +",$indent2))
#if ($actionItem.getIssue())
-#set($issue=$actionItem.getIssue())
+#set($issue="$actionItem.getIssue():")
+## Pad shorter issue numbers
+#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end
+#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end
+#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end
#else
-#set($issue="")
+#set($issue=$indent1)
#end
#if ($actionItem.getDueTo())
-#set($dueto=$actionItem.getDueTo())
+#set($dueto=" Thanks to $actionItem.getDueTo().")
#else
#set($dueto="")
#end
-o#if($!issue != "") $issue: #else$indent#end ${action} #if($!dueto !=
"")Thanks to $dueto. #end
-
+o $issue ${action}$dueto
+#set($action="")
#set($issue="")
#set($dueto="")
-#end
#end
##
-#if ($release.getActions('fix').size() !=0)
+#if ($release.getActions().size() == 0)
+No changes defined in this version.
+#else
+Changes in this version include:
+#if ($release.getActions('add').size() !=0)
+New features:
+#foreach($actionItem in $release.getActions('add'))
+#processaction()
+#end
+#end
+
+#if ($release.getActions('fix').size() !=0)
Fixed Bugs:
#foreach($actionItem in $release.getActions('fix'))
-## Use replaceAll to fix up LF-only line ends on Windows.
-#set($action=$actionItem.getAction().replaceAll("\n","
-"))
-#if ($actionItem.getIssue())
-#set($issue=$actionItem.getIssue())
-#else
-#set($issue="")
+#processaction()
#end
-#if ($actionItem.getDueTo())
-#set($dueto=$actionItem.getDueTo())
-#else
-#set($dueto="")
#end
-o#if($!issue != "") $issue: #else$indent#end ${action} #if($!dueto !=
"")Thanks to $dueto. #end
-#set($issue="")
-#set($dueto="")
-#end
-#end
-##
#if ($release.getActions('update').size() !=0)
-
Changes:
#foreach($actionItem in $release.getActions('update'))
-## Use replaceAll to fix up LF-only line ends on Windows.
-#set($action=$actionItem.getAction().replaceAll("\n","
-"))
-#if ($actionItem.getIssue())
-#set($issue=$actionItem.getIssue())
-#else
-#set($issue="")
+#processaction()
#end
-#if ($actionItem.getDueTo())
-#set($dueto=$actionItem.getDueTo())
-#else
-#set($dueto="")
#end
-o#if($!issue != "") $issue: #else$indent#end ${action} #if($!dueto !=
"")Thanks to $dueto. #end
-#set($issue="")
-#set($dueto="")
-#end
-#end
-##
#if ($release.getActions('remove').size() !=0)
-
Removed:
#foreach($actionItem in $release.getActions('remove'))
-## Use replaceAll to fix up LF-only line ends on Windows.
-#set($action=$actionItem.getAction().replaceAll("\n","
-"))
-#if ($actionItem.getIssue())
-#set($issue=$actionItem.getIssue())
-#else
-#set($issue="")
-#end
-#if ($actionItem.getDueTo())
-#set($dueto=$actionItem.getDueTo())
-#else
-#set($dueto="")
-#end
-o#if($!issue != "") $issue: #else$indent#end ${action} #if($!dueto !=
"")Thanks to $dueto. #end
-
-#set($issue="")
-#set($dueto="")
+#processaction()
#end
#end
## End of main loop
