From ee58ed75d934ac6b8267624197cbbaab7982e612 Mon Sep 17 00:00:00 2001
From: Arnold Galovics <galovicsarnold@gmail.com>
Date: Mon, 11 Sep 2023 13:51:25 +0200
Subject: [PATCH] Changed docker-publish and fineract-client-publish workflows
 to use develop-mifos branch

---
 .github/workflows/docker-publish.yml          |  2 +-
 .github/workflows/fineract-client-publish.yml |  2 +-
 build.gradle                                  | 37 +++++++------------
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 8aa36b6cc71..a8ffa94edf6 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -3,7 +3,7 @@ name: Publish Fineract to Docker Hub
 on:
   push:
     branches:
-      - develop
+      - develop-mifos
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/fineract-client-publish.yml b/.github/workflows/fineract-client-publish.yml
index 7146c46c8f2..551189942fc 100644
--- a/.github/workflows/fineract-client-publish.yml
+++ b/.github/workflows/fineract-client-publish.yml
@@ -3,7 +3,7 @@ name: Publish Fineract client to Mifos Artifactory
 on:
   push:
     branches:
-      - develop
+      - develop-mifos
 
 permissions:
   contents: write
diff --git a/build.gradle b/build.gradle
index edf9d6d2d23..2b71dbb5637 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,22 +122,23 @@ gradle clean bootRun'''
 
 version = '0.0.0-SNAPSHOT'
 
-gitVersioning.apply {
-    refs {
-        considerTagsOnBranches = true
-        describeTagPattern = '.*(\\d+\\.\\d+\\.\\d+).*'
-        describeTagFirstParent = false
-
-        branch("release\\/\\d+\\.\\d+\\.\\d+") {
-            version = '${describe.tag.version.major}.${describe.tag.version.minor}.${describe.tag.version.patch}'
+if (project.hasProperty('fineract.release.version')) {
+    gitVersioning.apply {
+        refs {
+            considerTagsOnBranches = true
+
+            tag("(?<version>.*)") {
+                version = "0.0.${project.getProperty('fineract.release.version')}-\${commit.short}"
+            }
+
+            branch(".+") {
+                version = "0.0.${project.getProperty('fineract.release.version')}-\${commit.short}"
+            }
         }
-        branch("maintenance\\/\\d+\\.\\d+") {
-            version = '${describe.tag.version.major}.${describe.tag.version.minor}.${describe.tag.version.patch}'
+        rev {
+            version = "0.0.${project.getProperty('fineract.release.version')}-\${commit.short}"
         }
     }
-    rev {
-        version = '${describe.tag.version.major}.${describe.tag.version.minor.next}.${describe.tag.version.patch}-SNAPSHOT'
-    }
 }
 
 ext['groovy.version'] = '4.0.17'
@@ -728,10 +729,6 @@ configure(project.fineractCustomProjects) {
 configure(project.fineractPublishProjects) {
     apply plugin: 'maven-publish'
 
-    if (!project.hasProperty('noSign')) {
-        apply plugin: 'signing'
-    }
-
     publishing {
         publications {
             mavenJava(MavenPublication) {
@@ -787,12 +784,6 @@ configure(project.fineractPublishProjects) {
             }
         }
     }
-
-    if (!project.hasProperty('noSign')) {
-        signing {
-            sign publishing.publications.mavenJava
-        }
-    }
 }
 
 task printSourceSetInformation() {