From b56ea9f140913a8efce4b71ed9a1f23ff22c8d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Wed, 3 Jun 2020 11:48:45 +0200
Subject: [PATCH]  HHH-14083 Move the update to version.properties to a release
 task

---
 gradle/base-information.gradle | 13 ++++---------
 release/release.gradle         | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/gradle/base-information.gradle b/gradle/base-information.gradle
index af34e8315b..3affd900a4 100644
--- a/gradle/base-information.gradle
+++ b/gradle/base-information.gradle
@@ -9,18 +9,13 @@ apply plugin: 'base'
 
 File versionFile = file( "${rootProject.projectDir}/gradle/version.properties" )
 
-if ( project.hasProperty( 'releaseVersion' ) ) {
-	if ( !project.hasProperty( 'developmentVersion' ) ) {
-		throw new GradleException(
-				"When the releaseVersion parameter is specified, the parameter developmentVersion is required as well."
-		)
-	}
-	versionFile.text = "hibernateVersion=${project.property( 'releaseVersion' )}"
-}
-
 ext {
 	ormVersionFile = versionFile
 	ormVersion = HibernateVersion.fromFile( versionFile, project )
+	// Override during releases
+	if ( project.hasProperty( 'releaseVersion' ) ) {
+		ormVersion = new HibernateVersion( project.releaseVersion, project )
+	}
 	baselineJavaVersion = '1.8'
 	jpaVersion = new JpaVersion('2.2')
 }
diff --git a/release/release.gradle b/release/release.gradle
index 3b702cc259..7de61a103a 100644
--- a/release/release.gradle
+++ b/release/release.gradle
@@ -253,10 +253,19 @@ if ( project.hasProperty( 'gitRemote' ) ) {
     gitRemote = project.property( 'gitRemote' )
 }
 
-task updateChangeLogFile {
+task addVersionCommit {
     group = "Release"
-    description = "Updates the changelog.txt file and push the changes to github"
+    description = "Updates the changelog.txt file, adds a commit for the released version and push the changes to github"
     doFirst{
+        if ( !project.hasProperty( 'releaseVersion' ) ) {
+            throw new GradleException(
+                    "The releaseVersion parameter is necessary to create the version commit."
+            )
+        }
+
+        logger.lifecycle( "Updating version to '${project.releaseVersion}'..." )
+        project.ormVersionFile.text = "hibernateVersion=${project.releaseVersion}"
+
         logger.lifecycle( "Appending version '${project.releaseVersion}' to changelog..." )
         ChangeLogFile.update( ormVersion.fullName );
 
@@ -295,8 +304,8 @@ task ciRelease() {
     }
 }
 
-ciRelease.dependsOn updateChangeLogFile, release
-release.mustRunAfter updateChangeLogFile
+ciRelease.dependsOn addVersionCommit, release
+release.mustRunAfter addVersionCommit
 
 static void executeGitCommand(Object ... subcommand){
     List<Object> command = ['git']