Repository: commons-release-plugin Updated Branches: refs/heads/master d584fab29 -> 7505912b8
COMMONSSITE-122: stage-distributions mojo assumes site directory has basename 'site' 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/7505912b Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/7505912b Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/7505912b Branch: refs/heads/master Commit: 7505912b803ad4394ceb4ef70dd866d20b2627e5 Parents: d584fab Author: Matt Benson <mben...@apache.org> Authored: Wed Aug 29 14:59:21 2018 -0500 Committer: Matt Benson <mben...@apache.org> Committed: Wed Aug 29 14:59:21 2018 -0500 ---------------------------------------------------------------------- .../release/plugin/mojos/CommonsDistributionStagingMojo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/7505912b/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 7fb1ea0..6221c34 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 @@ -352,12 +352,12 @@ public class CommonsDistributionStagingMojo extends AbstractMojo { "\"mvn site\" was not run before this goal, or a siteDirectory did not exist." ); } + File siteInScm = new File(distVersionRcVersionDirectory, "site"); try { - FileUtils.copyDirectoryToDirectory(siteDirectory, distVersionRcVersionDirectory); + FileUtils.copyDirectory(siteDirectory, siteInScm); } catch (IOException e) { throw new MojoExecutionException("Site copying failed", e); } - File siteInScm = new File(distVersionRcVersionDirectory, "site"); return new ArrayList<>(FileUtils.listFiles(siteInScm, null, true)); }
