From ce4ef0fa41843269fda36eba4e32824d35b05063 Mon Sep 17 00:00:00 2001
From: Joseph Manley <j@cloudsumu.com>
Date: Fri, 31 Jan 2020 13:14:26 -0500
Subject: [PATCH 1/2] Added getVersion() groovy function

---
 vars/getVersion.groovy | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 vars/getVersion.groovy

diff --git a/vars/getVersion.groovy b/vars/getVersion.groovy
new file mode 100644
index 0000000..22b3c93
--- /dev/null
+++ b/vars/getVersion.groovy
@@ -0,0 +1,14 @@
+#!/usr/bin/env groovy
+
+/** 
+ * Run semver_get_version to return the current version of the repository
+ *
+ * @param flags Flags or arguments to pass to semver_get_version
+ * @return "1.9.2"
+ */
+def call(flags='') {
+    def VERSION
+    VERSION = sh(returnStdout: true, script: "semver_get_version ${flags}")
+    return VERSION.trim()
+}
+

From 1ce86ccb03f37856dfc1f90a02cfbe525bdd25a4 Mon Sep 17 00:00:00 2001
From: Joseph Manley <j@cloudsumu.com>
Date: Thu, 6 Feb 2020 13:08:52 -0500
Subject: [PATCH 2/2] Update regex to support GitLab

---
 semver/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/semver/__init__.py b/semver/__init__.py
index c654210..0df9fe7 100644
--- a/semver/__init__.py
+++ b/semver/__init__.py
@@ -19,7 +19,7 @@ NO_GIT_FLOW = Exception('No git flow branch found')
 
 class SemVer(object):
 
-    GET_COMMIT_MESSAGE = re.compile(r"Merge (branch|pull request) '?(.+)'? (into|from) ([\w/-]+)")
+    GET_COMMIT_MESSAGE = re.compile(r"Merge (branch|pull request) '?(.+)'? (into|from) '?([\w\-]+)'?")
     # Merge pull request #1 from RightBrain-Networks/feature/PLAT-185-versioning
 
     def __init__(self,global_user=False):