From f22faa1418403e28c6eed0ce4defbe0c5f860afa Mon Sep 17 00:00:00 2001
From: Peter Pitterling <peter.pitterling@sap.com>
Date: Thu, 27 Sep 2018 14:54:29 +0200
Subject: [PATCH 1/2] fix issue introduced with recent PR - finalzie static
 class refactor - cleanup

---
 .../java/net/atomique/ksar/VersionNumber.java | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/main/java/net/atomique/ksar/VersionNumber.java b/src/main/java/net/atomique/ksar/VersionNumber.java
index b722507..801dd9d 100644
--- a/src/main/java/net/atomique/ksar/VersionNumber.java
+++ b/src/main/java/net/atomique/ksar/VersionNumber.java
@@ -13,31 +13,27 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-public class VersionNumber {
+public final class VersionNumber {
 
   private static final Logger log = LoggerFactory.getLogger(VersionNumber.class);
 
-  private VersionNumber() {
+  static {
+
     StringBuilder tmpstr = new StringBuilder();
-    BufferedReader reader = null;
-    try {
-      InputStream is = this.getClass().getResourceAsStream("/kSar.version");
-      InputStreamReader isr = new InputStreamReader(is);
-      reader = new BufferedReader(isr);
-      String line = "";
+
+    InputStream is = VersionNumber.class.getClassLoader().getResourceAsStream("kSar.version");
+    try (BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {
+
+      String line;
       while ((line = reader.readLine()) != null) {
         tmpstr.append(line);
       }
-      reader.close();
+
+      version_string = tmpstr.toString();
+
     } catch (IOException ex) {
-      log.error("Unable to read Current version", ex);
-      return;
+      log.error("Unable to read ksar version", ex);
     }
-    setVersionNumber(tmpstr.toString());
-  }
-
-  private static void setVersionNumber(String version) {
-    version_string = version;
   }
 
   public static String getVersionString() {

From d0938270ff42df772280beaf147d360b07da216f Mon Sep 17 00:00:00 2001
From: Peter Pitterling <peter.pitterling@sap.com>
Date: Thu, 27 Sep 2018 14:55:35 +0200
Subject: [PATCH 2/2] move version property from build.gradle to
 gradle.properties file clean writeversion task

---
 build.gradle      | 8 ++------
 gradle.properties | 6 ++++++
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 gradle.properties

diff --git a/build.gradle b/build.gradle
index 9db45b0..14fb908 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'checkstyle'
 
 group = 'com.github.vlsi.ksar'
 archivesBaseName = 'ksar'
-version = '5.2.4-SNAPSHOT'
+
 
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
@@ -33,11 +33,7 @@ dependencies {
 }
 
 task writeVersion << {
-    def s = version.find(/^\d.\d.\d/)
-    if (s == null) {
-        throw new InvalidUserDataException('Invalid version format')
-    }
-    new File("build/resources/main/kSar.version").text = s
+    new File("build/resources/main/kSar.version").text = version
 }
 classes.dependsOn(writeVersion)
 
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..a1ae950
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,6 @@
+#
+# Copyright 2018 The kSAR Project. All rights reserved.
+# See the LICENSE file in the project root for more information.
+#
+
+version = 5.2.4-SNAPSHOT
\ No newline at end of file