HHH-8730 - uploadDocumentation task needs to stage aggregated javadocs before rsync

(cherry picked from commit 40a8657)

Author: sebersole

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"
         }
     }
 }