From 386bfc303efd6726bb510e355d64266be32293d6 Mon Sep 17 00:00:00 2001 From: vmassol Date: Sun, 18 Apr 2004 20:59:42 +0000 Subject: [PATCH] Applied MPANNOUNCEMENT-2. Added more information when running the plugin. Also added a check to verify if the announcement version matches an entry in the changes.xml file. Thanks Fabrizio! git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115023 13f79535-47bb-0310-9956-ffa450edef68 --- announcement/plugin.jelly | 26 ++++++++++++++++--- announcement/plugin.properties | 2 +- .../src/plugin-resources/announcement.jsl | 2 +- announcement/xdocs/changes.xml | 12 +++++---- announcement/xdocs/navigation.xml | 7 +++-- announcement/xdocs/properties.xml | 4 +-- 6 files changed, 38 insertions(+), 15 deletions(-) diff --git a/announcement/plugin.jelly b/announcement/plugin.jelly index 90cfd1ad..a323c1a1 100644 --- a/announcement/plugin.jelly +++ b/announcement/plugin.jelly @@ -24,7 +24,9 @@ xmlns:ant="jelly:ant" xmlns:define="jelly:define" xmlns:util="jelly:util" - xmlns:doc="doc"> + xmlns:doc="doc" + xmlns:maven="jelly:maven" + xmlns:jsl="jelly:jsl"> @@ -35,12 +37,28 @@ The 'maven.announcement.version' property needs to be defined. - - Generating announcement for release ${maven.announcement.version} ... + + Generating announcement for release ${maven.announcement.version} ... - + + + + + + + + + + + + + + The release '${maven.announcement.version}' could not be found in change log + + + You can download the ${pom.name} here: -${pom.distributionDirectory} +${pom.url} Have fun! -The development team diff --git a/announcement/xdocs/changes.xml b/announcement/xdocs/changes.xml index f1aef0da..af7cefc3 100644 --- a/announcement/xdocs/changes.xml +++ b/announcement/xdocs/changes.xml @@ -25,17 +25,19 @@ - - Several new addtions that makes the plugin more generic: + + Added more information when running the plugin. Also added a check to + verify if the announcement version matches an entry in the + changes.xml file. + + + Several new additions that makes the plugin more generic: the team name is now taken from pom.groupId, "[]" are removed from the first line, changes are sorted by type, changes report issue number and due-to, the download link is generated from pom.distributionDirectory and the "plugin has been tested with..." line has been removed. - - Removed default value for the maven.announcement.version - property. This property has to be set by the plugin user. Update to ASL v.2 diff --git a/announcement/xdocs/navigation.xml b/announcement/xdocs/navigation.xml index 03d1f975..3a739474 100644 --- a/announcement/xdocs/navigation.xml +++ b/announcement/xdocs/navigation.xml @@ -23,11 +23,14 @@ - + - + + + + diff --git a/announcement/xdocs/properties.xml b/announcement/xdocs/properties.xml index 0e4b8593..91f9fe32 100644 --- a/announcement/xdocs/properties.xml +++ b/announcement/xdocs/properties.xml @@ -30,12 +30,12 @@ PropertyOptional?DescriptionDefault maven.announcement.version - No + Yes Version for which to create a release note. - No default value + ${pom.version}