You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2008/11/16 21:11:04 UTC

svn commit: r718102 - in /maven/plugins/trunk/maven-changes-plugin: ./ src/it/announce-generate/ src/it/announce-generate/src/changes/ src/main/java/org/apache/maven/plugin/announcement/

Author: olamy
Date: Sun Nov 16 12:11:04 2008
New Revision: 718102

URL: http://svn.apache.org/viewvc?rev=718102&view=rev
Log:
[MCHANGES-127] fix it test 

Modified:
    maven/plugins/trunk/maven-changes-plugin/pom.xml
    maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/pom.xml
    maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/src/changes/changes.xml
    maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/verify.groovy
    maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java

Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=718102&r1=718101&r2=718102&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Sun Nov 16 12:11:04 2008
@@ -378,7 +378,7 @@
               <pomIncludes>
                 <pomInclude>*/pom.xml</pomInclude>
               </pomIncludes>
-              <postBuildHookScript>verify.bsh</postBuildHookScript>
+              <postBuildHookScript>verify</postBuildHookScript>
               <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
               <goals>
                 <goal>clean</goal>

Modified: maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/pom.xml?rev=718102&r1=718101&r2=718102&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/pom.xml Sun Nov 16 12:11:04 2008
@@ -42,7 +42,7 @@
     <url>http://localhost/bla</url>
   </issueManagement>
   <properties>
-    <changesPluginVersion>2.0</changesPluginVersion>
+    <changesPluginVersion>@pom.version@</changesPluginVersion>
   </properties>
   <build>
     <pluginManagement>

Modified: maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/src/changes/changes.xml?rev=718102&r1=718101&r2=718102&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/src/changes/changes.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/src/changes/changes.xml Sun Nov 16 12:11:04 2008
@@ -31,7 +31,7 @@
       <action dev="me" type="fix" issue="MCHANGES-88">
         Enable retrieving component-specific issues.
       </action>
-      <action dev="jruiz" type="remove">
+      <action dev="jruiz" type="remove" issue="MCHANGES-899">
         The element type " link " must be terminated by the matching end-tag.
         Deleted the erroneous code.
         <fixes issue="MCHANGES-1"/>
@@ -39,7 +39,7 @@
         <dueto name="John Doe" email="john@doe.com"/>
         <dueto name="Jane Doe"/>
       </action>
-      <action dev="you" type="update" system="bugzilla">
+      <action dev="you" type="update" issue="MCHANGES-999" system="bugzilla">
         Handle different issue systems.
         <fixes issue="bug-12345"/>
         <dueto name="John Doe" email="john@doe.com"/>

Modified: maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/verify.groovy?rev=718102&r1=718101&r2=718102&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/verify.groovy (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate/verify.groovy Sun Nov 16 12:11:04 2008
@@ -20,7 +20,7 @@
 assert new File(basedir, 'target/announcement/announcement.vm').exists();
 content = new File(basedir, 'target/announcement/announcement.vm').text;
 
-assert content.contains( 'Nice library' );
+assert content.contains( 'Test report.' );
 
 assert content.contains( 'Changes in this version include:' );
 
@@ -34,7 +34,7 @@
 
 assert content.contains( 'Changes:' );
 
-assert content.contains( 'o Handle different issue systems.' );
+assert content.contains( 'o Handle different issue systems.  Issue: MCHANGES-999.' );
 
 assert content.contains( 'o Updated dependencies.' );
 
@@ -42,5 +42,6 @@
 
 assert content.contains( 'o The element type \" link \" must be terminated by the matching end-tag.' );
 
-assert content.contains( 'Deleted the erroneous code.' );
+assert content.contains( 'Deleted the erroneous code.  Issue: MCHANGES-899.' );
 
+return true;

Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java?rev=718102&r1=718101&r2=718102&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java Sun Nov 16 12:11:04 2008
@@ -480,9 +480,9 @@
         {
             action = (Action) iterator.next();
             getLog().debug( "o " + action.getType() );
-            getLog().debug( "  - " + action.getIssue() );
-            getLog().debug( "  - " + action.getAction() );
-            getLog().debug( "  - " + action.getDueTo() );
+            getLog().debug( "issue : " + action.getIssue() );
+            getLog().debug( "action : " + action.getAction() );
+            getLog().debug( "dueTo : " + action.getDueTo() );
         }
     }