Author: hboutemy
Date: Sun Sep 20 14:37:00 2015
New Revision: 1704147
URL: http://svn.apache.org/viewvc?rev=1704147&view=rev
Log:
[MSCMPUB-19] edge case when a SCM does not have private SCM filenames
Submitted by: Roman Korpachyov
Modified:
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
Modified:
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java?rev=1704147&r1=1704146&r2=1704147&view=diff
==============================================================================
---
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
(original)
+++
maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
Sun Sep 20 14:37:00 2015
@@ -88,8 +88,10 @@ public class ScmPublishPublishScmMojo
private void update( File checkout, File dir, List<String> doNotDeleteDirs
)
throws IOException
{
- String[] files =
- checkout.list( new NotFileFilter( new NameFileFilter(
scmProvider.getScmSpecificFilename() ) ) );
+ String scmSpecificFilename = scmProvider.getScmSpecificFilename();
+ String[] files = scmSpecificFilename != null
+ ? checkout.list( new NotFileFilter( new
NameFileFilter( scmSpecificFilename ) ) )
+ : checkout.list();
Set<String> checkoutContent = new HashSet<String>( Arrays.asList(
files ) );
List<String> dirContent = ( dir != null ) ? Arrays.asList( dir.list()
) : Collections.<String>emptyList();