update groovy-all file check string

Repast · Oct 23, 2017 · 8045864 · 8045864
1 parent 52cf1bd
commit 8045864
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/....distributed.batch.ui/src-standalone/repast/simphony/batch/standalone/StandAloneMain.java b/....distributed.batch.ui/src-standalone/repast/simphony/batch/standalone/StandAloneMain.java
@@ -80,8 +80,20 @@ protected File findGroovyJar(String bundleDir) {
     if (!candidateGroovyAllJars.isEmpty()) {
       Version latest = new Version("0.0.0");
       for (File gJar : candidateGroovyAllJars) {
-        String name = gJar.getName().substring("groovy-all-".length());
-        Version current = new Version(name);
+
+      	// Groovy all jar format is usually: groovy-all-x.x.x-suffix.jar so need
+      	//  to extract the number version x.x.x
+
+      	// remove the prefix
+        String ver = gJar.getName().substring("groovy-all-".length());
+
+        // remove the suffix
+        int suffixIndex = ver.indexOf('-');
+
+        if (suffixIndex > 0)
+        	ver = ver.substring(0, suffixIndex);
+
+        Version current = new Version(ver);
         if (latest.lessEqual(current)) {
           latest = current;
           latestGJar = gJar;