release project and up-to-date improvements

release/release.gradle

@@ -18,9 +18,7 @@ apply plugin: 'distribution'
 idea.module {
 }
 
-final File documentationDir = mkdir( "${project.buildDir}/documentation" )
-final File projectTemplateStagingDir = mkdir( "${project.buildDir}/projectTemplate" )
-
+//def documentationDir = project.layout.buildDirectory.dir('documentation')
 
 configurations {
     core
@@ -80,23 +78,23 @@ task assembleDocumentation(type: Copy) {
 
     // Integrations Guide
     from "${rootProject.project( 'documentation' ).buildDir}/asciidoc/integrationguide"
-    into "${documentationDir}/integrationguide"
+    into "${buildDir}/documentation/integrationguide"
 
     // Getting-started Guide
     from "${rootProject.project( 'documentation' ).buildDir}/asciidoc/quickstart"
-    into "${documentationDir}/quickstart"
+    into "${buildDir}/documentation/quickstart"
 
     // Topical Guide
     from "${rootProject.project( 'documentation' ).buildDir}/asciidoc/topical"
-    into "${documentationDir}/topical"
+    into "${buildDir}/documentation/topical"
 
     // User Guide
     from "${rootProject.project( 'documentation' ).buildDir}/asciidoc/userguide"
-    into "${documentationDir}/userguide"
+    into "${buildDir}/documentation/userguide"
 
     // Aggregated JavaDoc
     from "${rootProject.project( 'documentation' ).buildDir}/javadocs"
-    into "${documentationDir}/javadocs"
+    into "${buildDir}/documentation/javadocs"
 }
 
 //task assembleProjectTemplates(type:Copy, dependsOn: project( ":project-template" ).tasks.assembleDist) {
@@ -117,7 +115,7 @@ task uploadDocumentation(type:Exec) {
     final String url = "filemgmt.jboss.org:/docs_htdocs/hibernate/orm/${rootProject.ormVersion.family}";
 
     executable 'rsync'
-    args '-avz', '--links', '--protocol=28', "${documentationDir.absolutePath}/", url
+    args '-avz', '--links', '--protocol=28', "${buildDir}/documentation/", url
 
     doFirst {
         if ( rootProject.ormVersion.isSnapshot ) {
@@ -214,7 +212,7 @@ distributions {
             }
 
             into('documentation') {
-                from documentationDir
+                from "${buildDir}/documentation"
             }
 
             into( 'project' ) {