#384

Author: paxtonhare

marklogic-data-hub/src/main/java/com/marklogic/hub/DataHub.java

@@ -574,6 +574,29 @@ public String getHubVersion() {
         return "1.0.0";
     }
 
+    public static int versionCompare(String v1, String v2) {
+        if(v1 == null || v2 == null) {
+            return 1;
+        }
+        String[] v1Parts = v1.split("\\.");
+        String[] v2Parts = v2.split("\\.");
+        int length = Math.max(v1Parts.length, v2Parts.length);
+        for(int i = 0; i < length; i++) {
+            int v1Part = i < v1Parts.length ? Integer.parseInt(v1Parts[i]) : 0;
+            int v2Part = i < v2Parts.length ? Integer.parseInt(v2Parts[i]) : 0;
+
+            if(v1Part < v2Part) {
+                return -1;
+            }
+
+            if(v1Part > v2Part) {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+
     class EntitiesValidator extends ResourceManager {
         private static final String NAME = "validate";
 

ml-data-hub-plugin/src/main/groovy/com/marklogic/gradle/DataHubPlugin.groovy

@@ -18,7 +18,7 @@ class DataHubPlugin implements Plugin<Project> {
 
     @Override
     void apply(Project project) {
-        if (Double.parseDouble(project.gradle.gradleVersion) < 3.1) {
+        if (DataHub.versionCompare(project.gradle.gradleVersion, "3.1") == -1) {
             logger.error("\n\n" +
                 "********************************\n" +
                 "Hold the phone!\n\n" +

quick-start/src/main/java/com/marklogic/quickstart/service/DataHubService.java

@@ -168,31 +168,10 @@ private String getQuickStartVersion() throws IOException {
         return version;
     }
 
-    private int versionCompare(String v1, String v2) {
-        if(v1 == null || v2 == null) {
-            return 1;
-        }
-        String[] v1Parts = v1.split("\\.");
-        String[] v2Parts = v2.split("\\.");
-        int length = Math.max(v1Parts.length, v2Parts.length);
-        for(int i = 0; i < length; i++) {
-            int v1Part = i < v1Parts.length ? Integer.parseInt(v1Parts[i]) : 0;
-            int v2Part = i < v2Parts.length ? Integer.parseInt(v2Parts[i]) : 0;
-
-            if(v1Part < v2Part) {
-                return -1;
-            }
-
-            if(v1Part > v2Part) {
-                return 1;
-            }
-        }
-        return 0;
-    }
     public boolean updateHub(HubConfig config) throws IOException {
         DataHub dataHub = new DataHub(config);
         boolean result = false;
-        int compare = versionCompare(dataHub.getHubVersion(), "1.1.0");
+        int compare = DataHub.versionCompare(dataHub.getHubVersion(), "1.1.0");
         if (compare == -1) {
             result = dataHub.updateHubFromPre110();
         } else if (compare == 0) {