From 85e9ae780011d311a5e4e5c7c1e6d42d1703d3a4 Mon Sep 17 00:00:00 2001
From: Andrea Boriero <andrea@hibernate.org>
Date: Mon, 22 Jun 2020 17:14:47 +0100
Subject: [PATCH] HHH-14083 add task release must run after addVersionCommit
 task

---
 release/release.gradle | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/release/release.gradle b/release/release.gradle
index 8d1faf50c0..9a59f4853a 100644
--- a/release/release.gradle
+++ b/release/release.gradle
@@ -299,13 +299,7 @@ task changeLogFile( dependsOn: [releaseChecks] ) {
     }
 }
 
-rootProject.subprojects.each { Project subProject ->
-    if ( !this.name.equals( subProject.name ) ) {
-        if ( subProject.tasks.findByName( 'release' ) ) {
-            this.tasks.release.dependsOn( subProject.tasks.release )
-        }
-    }
-}
+
 
 task addVersionCommit( dependsOn: [changeLogFile] ) {
     group = "Release"
@@ -321,6 +315,15 @@ task addVersionCommit( dependsOn: [changeLogFile] ) {
 }
 release.mustRunAfter addVersionCommit
 
+rootProject.subprojects.each { Project subProject ->
+    if ( !this.name.equals( subProject.name ) ) {
+        if ( subProject.tasks.findByName( 'release' ) ) {
+            this.tasks.release.dependsOn( subProject.tasks.release )
+            subProject.tasks.release.mustRunAfter( this.tasks.addVersionCommit )
+        }
+    }
+}
+
 task ciRelease( dependsOn: [releaseChecks, addVersionCommit, release] ) {
     group = "Release"
     description = "Performs a release: the hibernate version is set and the changelog.txt file updated, the changes are pushed to github, then the release is performed, tagged and the hibernate version is set to the development one."