svn commit: r1377493 - in /maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish: ScmPublishInventory.java ScmPublishPublishScmMojo.java

[hb...@apache.org]

Author: hboutemy
Date: Sun Aug 26 19:36:12 2012
New Revision: 1377493

URL: http://svn.apache.org/viewvc?rev=1377493&view=rev
Log:
removed publish-scm dependency on ScmPublishInventory (which is deprecated and will disappear in the future)

Modified:
    maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java
    maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java

Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java?rev=1377493&r1=1377492&r2=1377493&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishInventory.java Sun Aug 26 19:36:12 2012
@@ -22,7 +22,6 @@ package org.apache.maven.plugins.scmpubl
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -65,11 +64,6 @@ public class ScmPublishInventory
 
     }
 
-    public static List<String> listInventory( File basedir, String ignoreFile )
-    {
-        return Arrays.asList( basedir.list( new IgnoreFilter( ignoreFile ) ) );
-    }
-
     public static List<File> listInventoryFiles( File basedir, String ignoreFile )
     {
         List<File> inventory = new ArrayList<File>();

Modified: maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java?rev=1377493&r1=1377492&r2=1377493&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java Sun Aug 26 19:36:12 2012
@@ -17,6 +17,8 @@ import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.filefilter.NameFileFilter;
+import org.apache.commons.io.filefilter.NotFileFilter;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
@@ -81,8 +83,9 @@ public class ScmPublishPublishScmMojo
     private void update( File checkout, File dir, List<String> doNotDeleteDirs )
         throws IOException
     {
-        Set<String> checkoutContent =
-            new HashSet<String>( ScmPublishInventory.listInventory( checkout, scmProvider.getScmSpecificFilename() ) );
+        String[] files = checkout.list( new NotFileFilter( new NameFileFilter( scmProvider.getScmSpecificFilename() ) ) );
+
+        Set<String> checkoutContent = new HashSet<String>( Arrays.asList( files ) );
         List<String> dirContent = ( dir != null ) ? Arrays.asList( dir.list() ) : Collections.<String>emptyList();
 
         Set<String> deleted = new HashSet<String>( checkoutContent );