@Gary - should be able to stage from the plugin and have it commit again. -Rob
> On Jun 14, 2018, at 2:26 PM, [email protected] wrote: > > (fix) ingnore hidden files in staging > > > Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo > Commit: > http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/a5bfc15a > Tree: > http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/a5bfc15a > Diff: > http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/a5bfc15a > > Branch: refs/heads/master > Commit: a5bfc15a43a708a6eadac3b65e1745a1b122bc8e > Parents: 041d028 > Author: Rob Tompkins <[email protected]> > Authored: Thu Jun 14 14:26:24 2018 -0400 > Committer: Rob Tompkins <[email protected]> > Committed: Thu Jun 14 14:26:24 2018 -0400 > > ---------------------------------------------------------------------- > .../plugin/mojos/CommonsDistributionStagingMojo.java | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/a5bfc15a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java > ---------------------------------------------------------------------- > diff --git > a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java > > b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java > index f332c9d..09d4def 100755 > --- > a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java > +++ > b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java > @@ -196,7 +196,7 @@ public class CommonsDistributionStagingMojo extends > AbstractMojo { > List<File> filesToCommit = > copyDistributionsIntoScmDirectoryStructureAndAddToSvn(copiedReleaseNotes, > provider, repository); > List<File> filesToAdd = new ArrayList<>(); > - listFilesAndDirectories(distCheckoutDirectory, filesToAdd); > + listNotHiddenFilesAndDirectories(distCheckoutDirectory, > filesToAdd); > if (!dryRun) { > ScmFileSet fileSet = new ScmFileSet(distCheckoutDirectory, > filesToAdd); > AddScmResult addResult = provider.add( > @@ -235,15 +235,15 @@ public class CommonsDistributionStagingMojo extends > AbstractMojo { > * @param directory {@link File} containing directory to list > * @param files a {@link List} of {@link File} to which to append the > files. > */ > - private void listFilesAndDirectories(File directory, List<File> files) { > + private void listNotHiddenFilesAndDirectories(File directory, List<File> > files) { > // Get all the files and directories from a directory. > File[] fList = directory.listFiles(); > for (File file : fList) { > - if (file.isFile() && !file.getAbsolutePath().contains(".svn")) { > + if (file.isFile() && !file.isHidden()) { > files.add(file); > - } else if (file.isDirectory() && > !file.getAbsolutePath().contains(".svn")) { > + } else if (file.isDirectory() && !file.isHidden()) { > files.add(file); > - listFilesAndDirectories(file, files); > + listNotHiddenFilesAndDirectories(file, files); > } > } > } > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
