fix

Author: DavideD

release/build.gradle

@@ -3,7 +3,7 @@ import java.nio.charset.StandardCharsets
 ext {
     // Select which repository to use for publishing the documentation
     // Example:
-    // ./gradlew publishDocumentation \
+    // ./gradlew uploadDocumentation \
     //           -PdocPublishRepoUri="[email protected]:DavideD/hibernate.org.git" \
     //           -PdocPublishBranch="staging"
     if ( !project.hasProperty('docPublishRepoUri') ) {
@@ -22,7 +22,7 @@ description = 'Release module'
 // To publish the documentation:
 //  1. Add the relevant SSH key to your SSH agent.
 //  2. Execute this:
-//     ./gradlew publishDocumentation -PdocPublishBranch=production
+//     ./gradlew uploadDocumentation -PdocPublishBranch=production
 
 // To tag a version and trigger a release on CI (which will include publishing to Bintray and publishing documentation):
 //  ./gradlew ciRelease -PreleaseVersion=x.y.z.Final -PdevelopmentVersion=x.y.z-SNAPSHOT -PgitRemote=origin -PgitBranch=main
@@ -115,7 +115,7 @@ def pushDocChangesTask = tasks.register( 'pushDocChanges', Exec ) {
     commandLine 'git', 'push', '--atomic', 'origin', docPublishBranch
 }
 
-def publishDocumentationTask = tasks.register( 'publishDocumentation' ) {
+def uploadDocumentationTask = tasks.register( 'uploadDocumentation' ) {
     description "Upload documentation on the website"
     dependsOn pushDocChangesTask
     group "Release"
@@ -244,17 +244,7 @@ def pushChangesTask = tasks.register( "pushChanges" ) {
     }
 }
 
-def releasePerformTask = tasks.register( 'releasePerform' ) {
-    group 'Release'
-    description 'Performs a release on local check-out, including updating changelog and '
-
-    dependsOn publishReleaseArtifactsTask
-
-    finalizedBy releasePerformPostGitTask
-}
-
 def releasePerformPostGitTask = tasks.register( 'gitTasksAfterReleasePerform' ) {
-
     doLast {
         if ( project.createTag ) {
             logger.lifecycle( "Pushing branch and tag to remote `${project.gitRemote}`..." )
@@ -267,6 +257,16 @@ def releasePerformPostGitTask = tasks.register( 'gitTasksAfterReleasePerform' )
     }
 }
 
+def releasePerformTask = tasks.register( 'releasePerform' ) {
+    group 'Release'
+    description 'Performs a release on local check-out, including updating changelog and '
+
+    mustRunAfter releasePrepareTask
+    dependsOn uploadDocumentationTask
+
+    finalizedBy releasePerformPostGitTask
+}
+
 /*
 * Release everything
 */
@@ -303,3 +303,62 @@ static String inputStreamToString(InputStream inputStream) {
         }
     }
 }
+
+gradle.getTaskGraph().whenReady {tg->
+
+    if ( ( tg.hasTask( project.tasks.releasePrepare ) || tg.hasTask( project.tasks.releasePerform ) )
+            && ! project.getGradle().getStartParameter().isDryRun() ) {
+        String releaseVersionLocal
+        String developmentVersionLocal
+
+        def console = tg.hasTask( project.tasks.release ) && !tg.hasTask( project.tasks.ciRelease )
+                ? System.console()
+                : null
+
+        if (project.hasProperty('releaseVersion')) {
+            releaseVersionLocal = project.property('releaseVersion')
+        }
+        else {
+            if (console) {
+                // prompt for `releaseVersion`
+                releaseVersionLocal = console.readLine('> Enter the release version: ')
+            }
+            else {
+                throw new GradleException(
+                        "`release`-related tasks require the following properties: 'releaseVersion', 'developmentVersion'"
+                )
+            }
+        }
+
+        if (project.hasProperty('developmentVersion')) {
+            developmentVersionLocal = project.property('developmentVersion')
+        }
+        else {
+            if (console) {
+                // prompt for `developmentVersion`
+                developmentVersionLocal = console.readLine('> Enter the next development version: ')
+            }
+            else {
+                throw new GradleException(
+                        "`release`-related tasks require the following properties: 'releaseVersion', 'developmentVersion'"
+                )
+            }
+        }
+
+        assert releaseVersionLocal != null && developmentVersionLocal != null;
+
+        // set up information for the release-related tasks
+        project.ext {
+            releaseVersion = releaseVersionLocal;
+            developmentVersion = developmentVersionLocal;
+            createTag = !project.hasProperty('noTag')
+            releaseTag = project.createTag ? determineReleaseTag(releaseVersionLocal) : ''
+        }
+    }
+}
+
+static String determineReleaseTag(String releaseVersion) {
+    return releaseVersion.endsWith( '.Final' )
+            ? releaseVersion.replace( ".Final", "" )
+            : releaseVersion;
+}