commit 7505912b803ad4394ceb4ef70dd866d20b2627e5
author Matt Benson <mbenson@apache.org> Wed Aug 29 14:59:21 2018 -0500
committer Matt Benson <mbenson@apache.org> Wed Aug 29 14:59:21 2018 -0500
tree 88b3b74a78b51effd2c5e5eb0b767373bbe237a0
parent d584fab29d2727e723335183fb5817565d587695

COMMONSSITE-122: stage-distributions mojo assumes site directory has basename 'site'

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 @@
                     "\"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));
     }