From 2186b257c74c4c93889ed69e6ff457ca830d3b88 Mon Sep 17 00:00:00 2001
From: Tobias Kellner <tobias.kellner@iaik.tugraz.at>
Date: Wed, 4 Feb 2015 03:47:20 +0100
Subject: Use git hash instead of svn revision for version

---
 BKUApplet/pom.xml    | 10 +++-------
 BKUAppletExt/pom.xml | 10 +++-------
 BKULocal/pom.xml     | 10 +++-------
 BKUOnline/pom.xml    | 10 +++-------
 BKUWebStart/pom.xml  | 10 +++-------
 5 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index bb4a702a..30122d0c 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -211,8 +211,7 @@
     <profile>
       <!--
       This profile is here for triggering when another scm than svn is
-      used (for example git). Try to get the associated svn revision
-      from git-svn.
+      used (for example git). Get the git commit hash.
       -->
       <id>buildnumber-git</id>
       <activation>
@@ -240,12 +239,9 @@
                       shell = "cmd"
                       param = "/c"
                     }
-                    def gitSvnProc = [shell, param, "git svn info | grep Revision:"].execute()
+                    def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute()
                     gitSvnProc.waitFor()
-                    def svnref = "unknown"
-                    def out = gitSvnProc.in.text.split(" ")
-                    if (out.size() == 2)
-                      svnref = out[1].trim()
+                    def svnref = gitSvnProc.in.text.trim()
                     project.properties['gitSvnRev'] = svnref
                   </source>
                 </configuration>
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index 121fd1a2..6aae52bd 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -232,8 +232,7 @@
     <profile>
       <!--
       This profile is here for triggering when another scm than svn is
-      used (for example git). Try to get the associated svn revision
-      from git-svn.
+      used (for example git). Get the git commit hash.
       -->
       <id>buildnumber-git</id>
       <activation>
@@ -261,12 +260,9 @@
                       shell = "cmd"
                       param = "/c"
                     }
-                    def gitSvnProc = [shell, param, "git svn info | grep Revision:"].execute()
+                    def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute()
                     gitSvnProc.waitFor()
-                    def svnref = "unknown"
-                    def out = gitSvnProc.in.text.split(" ")
-                    if (out.size() == 2)
-                      svnref = out[1].trim()
+                    def svnref = gitSvnProc.in.text.trim()
                     project.properties['gitSvnRev'] = svnref
                   </source>
                 </configuration>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index a39d7b57..f258de68 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -201,8 +201,7 @@
     <profile>
       <!--
       This profile is here for triggering when another scm than svn is
-      used (for example git). Try to get the associated svn revision
-      from git-svn.
+      used (for example git). Get the git commit hash.
       -->
       <id>buildnumber-git</id>
       <activation>
@@ -230,12 +229,9 @@
                       shell = "cmd"
                       param = "/c"
                     }
-                    def gitSvnProc = [shell, param, "git svn info | grep Revision:"].execute()
+                    def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute()
                     gitSvnProc.waitFor()
-                    def svnref = "unknown"
-                    def out = gitSvnProc.in.text.split(" ")
-                    if (out.size() == 2)
-                      svnref = out[1].trim()
+                    def svnref = gitSvnProc.in.text.trim()
                     project.properties['gitSvnRev'] = svnref
                   </source>
                 </configuration>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index dacf78ff..d098a26f 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -320,8 +320,7 @@
     <profile>
       <!--
       This profile is here for triggering when another scm than svn is
-      used (for example git). Try to get the associated svn revision
-      from git-svn.
+      used (for example git). Get the git commit hash.
       -->
       <id>buildnumber-git</id>
       <activation>
@@ -349,12 +348,9 @@
                       shell = "cmd"
                       param = "/c"
                     }
-                    def gitSvnProc = [shell, param, "git svn info | grep Revision:"].execute()
+                    def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute()
                     gitSvnProc.waitFor()
-                    def svnref = "unknown"
-                    def out = gitSvnProc.in.text.split(" ")
-                    if (out.size() == 2)
-                      svnref = out[1].trim()
+                    def svnref = gitSvnProc.in.text.trim()
                     project.properties['gitSvnRev'] = svnref
                   </source>
                 </configuration>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 5d328062..0a44cff0 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -260,8 +260,7 @@
     <profile>
       <!--
       This profile is here for triggering when another scm than svn is
-      used (for example git). Try to get the associated svn revision
-      from git-svn.
+      used (for example git). Get the git commit hash.
       -->
       <id>buildnumber-git</id>
       <activation>
@@ -289,12 +288,9 @@
                       shell = "cmd"
                       param = "/c"
                     }
-                    def gitSvnProc = [shell, param, "git svn info | grep Revision:"].execute()
+                    def gitSvnProc = [shell, param, "git rev-parse --short HEAD"].execute()
                     gitSvnProc.waitFor()
-                    def svnref = "unknown"
-                    def out = gitSvnProc.in.text.split(" ")
-                    if (out.size() == 2)
-                      svnref = out[1].trim()
+                    def svnref = gitSvnProc.in.text.trim()
                     project.properties['gitSvnRev'] = svnref
                   </source>
                 </configuration>
-- 
cgit v1.2.3