From e463f6b6194d16695031ed2565acdbdb32af7061 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Fri, 10 Jan 2014 13:43:19 -0600
Subject: [PATCH] HHH-8730 - uploadDocumentation task needs to stage aggregated
 javadocs before rsync (cherry picked from commit
 40a8657de5b3b07671a867a6faa35fbb64844463)

---
 release/release.gradle | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/release/release.gradle b/release/release.gradle
index d2b9a442a1..ac69fc70d3 100644
--- a/release/release.gradle
+++ b/release/release.gradle
@@ -27,8 +27,9 @@ task assembleDocumentation(type: Task, dependsOn: [rootProject.project( 'documen
     description = 'Assembles all documentation into the {buildDir}/documentation directory'
 
     doLast {
-        // copy docbook outputs into target/documentation (javadocs are already there).  this is used in
-        // building the dist bundles
+        // copy documentation outputs into target/documentation.
+        // 		* this is used in building the dist bundles
+		//		* it is also used as a base to build a staged directory for documentation upload
         copy {
             from "${rootProject.project( 'documentation' ).buildDir}/docbook/publish"
             into documentationDir
@@ -38,8 +39,8 @@ task assembleDocumentation(type: Task, dependsOn: [rootProject.project( 'documen
             into documentationDir
         }
         copy {
-            from "${rootProject.project( 'documentation' ).buildDir}/javadoc"
-            into documentationDir
+            from "${rootProject.project( 'documentation' ).buildDir}/javadocs"
+            into "${documentationDir}/javadocs"
         }
     }
 }