From f399167667a3ae063ccc22d464ce49e1c8a282f3 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 3 Apr 2020 17:39:28 +0300
Subject: [PATCH] =?UTF-8?q?=D0=95=D0=B4=D0=B8=D0=BD=D1=8B=D0=B9=20=D0=BA?=
 =?UTF-8?q?=D0=BB=D0=B0=D1=81=D1=81=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D1=80=D1=81=D0=B8=D0=BD=D0=B3=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81?=
 =?UTF-8?q?=D0=B8=D0=B9=20=D0=B8=D0=B7=20XML?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vars/sonarScanner.groovy  |  3 +--
 vars/versionParser.groovy | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 vars/versionParser.groovy

diff --git a/vars/sonarScanner.groovy b/vars/sonarScanner.groovy
index 2b3409d..13c3585 100644
--- a/vars/sonarScanner.groovy
+++ b/vars/sonarScanner.groovy
@@ -11,8 +11,7 @@ def call(String rootFile = 'src/cf/Configuration.xml') {
     String scannerHome = tool config.sonarScannerToolName
     sonarCommand = "$scannerHome/bin/sonar-scanner -Dsonar.branch.name=$env.BRANCH_NAME"
 
-    def configurationText = readFile encoding: 'UTF-8', file: rootFile
-    String configurationVersion = version(configurationText)
+    String configurationVersion = versionParser.configuration(rootFile)
     if (configurationVersion) {
         sonarCommand += " -Dsonar.projectVersion=$configurationVersion"
     }
diff --git a/vars/versionParser.groovy b/vars/versionParser.groovy
new file mode 100644
index 0000000..92f5c65
--- /dev/null
+++ b/vars/versionParser.groovy
@@ -0,0 +1,17 @@
+import com.cloudbees.groovy.cps.NonCPS
+
+def configuration(rootFile = 'src/cf/Configuration.xml') {
+    def configurationText = readFile encoding: 'UTF-8', file: rootFile
+    return version(configurationText, /<Version>(.*)<\/Version>/)
+}
+
+def storage(versionFile = 'src/cf/VERSION') {
+    storageVersionText = readFile encoding: 'UTF-8', file: versionFile
+    return version(versionFile, /<VERSION>(.*)<\/VERSION>/)
+}
+
+@NonCPS
+private static String version(String text, String regexp) {
+    def matcher = text =~ regexp
+    return matcher ? matcher.group(1) : ""
+}
\ No newline at end of file