svn commit: r1171987 - in /maven/plugins/trunk/maven-changelog-plugin: ./ src/it/with-svnjava-maven-2.x/ src/it/with-svnjava-maven-3/ src/it/with-svnjava/ src/main/java/org/apache/maven/plugin/changelog/

[olamy]

Author: olamy
Date: Sat Sep 17 14:10:50 2011
New Revision: 1171987

URL: http://svn.apache.org/viewvc?rev=1171987&view=rev
Log:
force version in it poms and add NPE check in FileActivityComparator

Added:
    maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/
    
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/invoker.properties
      - copied, changed from r1171982, 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/invoker.properties
    
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/pom.xml
      - copied, changed from r1171982, 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/pom.xml
    
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/verify.groovy
      - copied, changed from r1171982, 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/verify.groovy
Removed:
    
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/invoker.properties
    maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/pom.xml
    maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/verify.groovy
Modified:
    maven/plugins/trunk/maven-changelog-plugin/pom.xml
    
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-2.x/pom.xml
    
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java

Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/pom.xml?rev=1171987&r1=1171986&r2=1171987&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Sat Sep 17 14:10:50 2011
@@ -343,6 +343,7 @@ under the License.
                 <goal>clean</goal>
                 <goal>site</goal>
               </goals>
+              <showErrors>true</showErrors>
             </configuration>
             <executions>
               <execution>

Modified: 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-2.x/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-2.x/pom.xml?rev=1171987&r1=1171986&r2=1171987&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-2.x/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-2.x/pom.xml
 Sat Sep 17 14:10:50 2011
@@ -74,6 +74,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-changelog-plugin</artifactId>
+        <version>@pom.version@</version>
         <configuration>
           <providerImplementations>
             <svn>javasvn</svn>

Copied: 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/invoker.properties
 (from r1171982, 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/invoker.properties)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/invoker.properties?p2=maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/invoker.properties&p1=maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/invoker.properties&r1=1171982&r2=1171987&rev=1171987&view=diff
==============================================================================
    (empty)

Copied: 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/pom.xml 
(from r1171982, 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/pom.xml)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/pom.xml?p2=maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/pom.xml&p1=maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/pom.xml&r1=1171982&r2=1171987&rev=1171987&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/pom.xml 
(original)
+++ 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/pom.xml 
Sat Sep 17 14:10:50 2011
@@ -63,6 +63,7 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-changelog-plugin</artifactId>
+              <version>@pom.version@</version>
               <configuration>
                 <issueIDRegexPattern>[A-Z]{2,}-\d+</issueIDRegexPattern>
                 <issueLinkUrl>http://jira.example.co.uk</issueLinkUrl>

Copied: 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/verify.groovy
 (from r1171982, 
maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/verify.groovy)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/verify.groovy?p2=maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava-maven-3/verify.groovy&p1=maven/plugins/trunk/maven-changelog-plugin/src/it/with-svnjava/verify.groovy&r1=1171982&r2=1171987&rev=1171987&view=diff
==============================================================================
    (empty)

Modified: 
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java?rev=1171987&r1=1171986&r2=1171987&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java
 (original)
+++ 
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java
 Sat Sep 17 14:10:50 2011
@@ -19,6 +19,7 @@ package org.apache.maven.plugin.changelo
  * under the License.
  */
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.maven.scm.ChangeFile;
 
 import java.util.Comparator;
@@ -34,7 +35,9 @@ import java.util.List;
 public class FileActivityComparator
     implements Comparator
 {
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public int compare( Object o1, Object o2 )
         throws ClassCastException
     {
@@ -98,6 +101,16 @@ public class FileActivityComparator
 
         String revision2 = getLatestRevision( list2 );
 
+        if ( revision1 == null )
+        {
+            return -1;
+        }
+
+        if ( revision2 == null )
+        {
+            return 1;
+        }
+
         return revision1.compareTo( revision2 );
     }
 
@@ -115,7 +128,7 @@ public class FileActivityComparator
         {
             ChangeFile file = (ChangeFile) i.next();
 
-            if ( latest.length() == 0 )
+            if ( StringUtils.isNotBlank( latest) )
             {
                 latest = file.getRevision();
             }