From e439b90f8e50fd20670bdf8f1b62c6a5ccdf0cfc Mon Sep 17 00:00:00 2001
From: Christian Beikov <christian.beikov@gmail.com>
Date: Wed, 4 Oct 2023 21:28:08 +0200
Subject: [PATCH] HHH-17239 Automate maintenance releases

---
 gradle/releasable.gradle | 1 -
 release/release.gradle   | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gradle/releasable.gradle b/gradle/releasable.gradle
index fdcb92c202..eb5052d02d 100644
--- a/gradle/releasable.gradle
+++ b/gradle/releasable.gradle
@@ -1,7 +1,6 @@
 apply from: rootProject.file( 'gradle/base-information.gradle' )
 
 task release {
-    dependsOn ':release:releaseChecks'
     mustRunAfter ':release:releaseChecks'
     enabled !project.ormVersion.isSnapshot
 }
diff --git a/release/release.gradle b/release/release.gradle
index dc1910dada..6b2f8adf32 100644
--- a/release/release.gradle
+++ b/release/release.gradle
@@ -229,14 +229,14 @@ def releaseChecksTask = tasks.register( "releaseChecks" ) {
             gitBranchLocal = project.property('gitBranch')
         }
         else {
-            gitBranchLocal = executeGitCommand( 'branch', '--show-current' )
+            gitBranchLocal = executeGitCommand( 'branch', '--show-current' ).trim()
         }
 
         if (project.hasProperty('gitRemote')) {
             gitRemoteLocal = project.property('gitRemote')
         }
         else {
-            final String remotes = executeGitCommand( 'remote', 'show' )
+            final String remotes = executeGitCommand( 'remote', 'show' ).trim()
             final List<String> tokens = remotes.tokenize()
             if ( tokens.size() != 1 ) {
                 throw new GradleException( "Could not determine `gitRemote` property for `releaseChecks` tasks." )
@@ -263,7 +263,7 @@ def releaseChecksTask = tasks.register( "releaseChecks" ) {
     }
 }
 
-def preVerifyReleaseTask = tasks.register( "preVerifyRelease" ){
+def preVerifyReleaseTask = tasks.register( "preVerifyRelease" ) {
     group 'Release'
     description 'Pre-verifies a release job execution (Run locally before a CI release)'