KYLO-2973: Updated POM versions to 0.10.0-SNAPSHOT and fixed version …

…handling to correctly deal with "0.10".
Alirezama · Nov 7, 2018 · e338d15 · e338d15
1 parent f303416
commit e338d15
Show file tree

Hide file tree

Showing 372 changed files with 474 additions and 476 deletions.
diff --git a/commons/commons-feed-util/pom.xml b/commons/commons-feed-util/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
   <properties>
     <plugin.license.parentRelative>../../</plugin.license.parentRelative>

diff --git a/commons/commons-hadoop/pom.xml b/commons/commons-hadoop/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>kylo-commons</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <name>Kylo Common Hadoop Utilities</name>

diff --git a/commons/commons-hive/pom.xml b/commons/commons-hive/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>kylo-commons</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kylo-commons-hive</artifactId>

diff --git a/commons/commons-jdbc/pom.xml b/commons/commons-jdbc/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>kylo-commons</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <properties>

diff --git a/commons/commons-jpa/pom.xml b/commons/commons-jpa/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
   <properties>
     <plugin.license.parentRelative>../../</plugin.license.parentRelative>

diff --git a/commons/commons-rest-client/pom.xml b/commons/commons-rest-client/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <properties>

diff --git a/commons/commons-rest-model/pom.xml b/commons/commons-rest-model/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>kylo-commons</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
   <properties>
     <plugin.license.parentRelative>../../</plugin.license.parentRelative>

diff --git a/commons/commons-security/pom.xml b/commons/commons-security/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
   <artifactId>kylo-commons-security</artifactId>
 

diff --git a/commons/commons-spark/commons-scala-2.10/pom.xml b/commons/commons-spark/commons-scala-2.10/pom.xml
@@ -7,11 +7,11 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons-spark</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kylo-commons-scala-2.10</artifactId>
-  <version>0.9.2-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
 
   <properties>
     <maven.compiler.source>1.7</maven.compiler.source>

diff --git a/commons/commons-spark/commons-scala-2.11/pom.xml b/commons/commons-spark/commons-scala-2.11/pom.xml
@@ -7,11 +7,11 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons-spark</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kylo-commons-scala-2.11</artifactId>
-  <version>0.9.2-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
 
   <properties>
     <maven.compiler.source>1.7</maven.compiler.source>

diff --git a/commons/commons-spark/commons-scala-api/pom.xml b/commons/commons-spark/commons-scala-api/pom.xml
@@ -7,11 +7,11 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons-spark</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kylo-commons-scala-api</artifactId>
-  <version>0.9.2-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
 
   <properties>
     <maven.compiler.source>1.7</maven.compiler.source>

diff --git a/commons/commons-spark/commons-spark-1.6/pom.xml b/commons/commons-spark/commons-spark-1.6/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons-spark</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kylo-commons-spark-1.6</artifactId>

diff --git a/commons/commons-spark/commons-spark-2.0/pom.xml b/commons/commons-spark/commons-spark-2.0/pom.xml
@@ -7,11 +7,11 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons-spark</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kylo-commons-spark-2.0</artifactId>
-  <version>0.9.2-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
 
   <properties>
     <maven.compiler.source>1.7</maven.compiler.source>

diff --git a/commons/commons-spark/commons-spark-api/pom.xml b/commons/commons-spark/commons-spark-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons-spark</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kylo-commons-spark-api</artifactId>

diff --git a/commons/commons-spark/commons-spark-livy-2.10/pom.xml b/commons/commons-spark/commons-spark-livy-2.10/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>kylo-commons-spark</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <description>A collection of useful helper functions for Livy.</description>

diff --git a/commons/commons-spark/commons-spark-livy-2.11/pom.xml b/commons/commons-spark/commons-spark-livy-2.11/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>kylo-commons-spark</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <description>A collection of useful helper functions for Livy.</description>

diff --git a/commons/commons-spark/commons-spark-livy/pom.xml b/commons/commons-spark/commons-spark-livy/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>kylo-commons-spark</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <description>A collection of useful helper functions for Livy.</description>

diff --git a/commons/commons-spark/commons-spark-repl/pom.xml b/commons/commons-spark/commons-spark-repl/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>kylo-commons-spark</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <description>A collection of useful helper functions for Spark.</description>

diff --git a/commons/commons-spark/commons-spark-shell-api/pom.xml b/commons/commons-spark/commons-spark-shell-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>kylo-commons-spark</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kylo-commons-spark-shell-api</artifactId>

diff --git a/commons/commons-spark/commons-spark-shell-plugin-shared/pom.xml b/commons/commons-spark/commons-spark-shell-plugin-shared/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>kylo-commons-spark</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <description>A collection of classes that can be shared between spark shell plugins.</description>

diff --git a/commons/commons-spark/commons-spark-shell-v1/pom.xml b/commons/commons-spark/commons-spark-shell-v1/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>kylo-commons-spark</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kylo-commons-spark-shell-v1</artifactId>

diff --git a/commons/commons-spark/commons-spark-shell-v2/pom.xml b/commons/commons-spark/commons-spark-shell-v2/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>kylo-commons-spark</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kylo-commons-spark-shell-v2</artifactId>

diff --git a/commons/commons-spark/pom.xml b/commons/commons-spark/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>kylo-commons</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
   <properties>
     <plugin.license.parentRelative>../../</plugin.license.parentRelative>

diff --git a/commons/commons-test-persistence/pom.xml b/commons/commons-test-persistence/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
   <properties>
     <plugin.license.parentRelative>../../</plugin.license.parentRelative>

diff --git a/commons/commons-test/pom.xml b/commons/commons-test/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
   <artifactId>kylo-commons-test</artifactId>
 

diff --git a/commons/commons-util/pom.xml b/commons/commons-util/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo-commons</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
   <properties>
     <java.version>1.7</java.version>

diff --git a/commons/commons-util/src/main/java/com/thinkbiganalytics/KyloVersion.java b/commons/commons-util/src/main/java/com/thinkbiganalytics/KyloVersion.java
@@ -32,19 +32,18 @@ public interface KyloVersion extends Comparable<KyloVersion> {
      */
     String getVersion();
 
-    /**
-     * Return the {@link #getMajorVersion()} as a numeric value
-     *
-     * @return the numeric value of the major version
-     */
-    Float getMajorVersionNumber();
-
     /**
      * Return the major versoin of Kylo
      *
      * @return the major version string
      */
     String getMajorVersion();
+
+    /**
+     * Derive a value that that be compared with another major version.
+     * @return a comparable value for the major version
+     */
+    Integer getMajorVersionValue();
 
     /**
      * Return the minor version of Kylo

diff --git a/commons/commons-util/src/main/java/com/thinkbiganalytics/KyloVersionUtil.java b/commons/commons-util/src/main/java/com/thinkbiganalytics/KyloVersionUtil.java
@@ -176,14 +176,27 @@ public String getVersion() {
          *
          * @return the major version
          */
+        @Override
         public String getMajorVersion() {
             return this.majorVersion == null ? "" : this.majorVersion;
         }
+
+        @Override
+        public Integer getMajorVersionValue() {
+            String major = getMajorVersion();
+            if (major.contains(".")) {
+                String[] split = major.split("\\.");
+                return Integer.parseInt(split[0]) * 10 + Integer.parseInt(split[1]);
+            } else {
+                return Integer.parseInt(major) * 10;
+            }
+        }
 
         public void setMajorVersion(String majorVersion) {
             this.majorVersion = majorVersion;
         }
 
+        @Override
         public String getMinorVersion() {
             return this.minorVersion == null ? "" : this.minorVersion;
         }
@@ -192,6 +205,7 @@ public void setMinorVersion(String minorVersion) {
             this.minorVersion = minorVersion;
         }
 
+        @Override
         public String getPointVersion() {
             return pointVersion == null ? "" : this.pointVersion;
         }
@@ -200,6 +214,7 @@ public void setPointVersion(String pointVersion) {
             this.pointVersion = pointVersion;
         }
 
+        @Override
         public String getTag() {
             return tag == null ? "" : this.tag;
         }
@@ -213,23 +228,6 @@ public KyloVersion withoutTag() {
             return new Version(this.getMajorVersion(), this.getMinorVersion(), this.getPointVersion(), null);
         }
 
-        /**
-         * @return the major version number
-         */
-        @Override
-        public Float getMajorVersionNumber() {
-            if (getMajorVersion() != null) {
-                try {
-                    return Float.parseFloat(getMajorVersion());
-                } catch (NumberFormatException e) {
-                    throw new IllegalStateException("Cannot parse major version number", e);
-                }
-            } else {
-                return null;
-            }
-        }
-
-
         @Override
         public String getDescription() {
             return description;
@@ -277,7 +275,7 @@ public String toString() {
         @Override
         public int compareTo(KyloVersion o) {
             int result = 0;
-            if ((result = getMajorVersion().compareTo(o.getMajorVersion())) != 0) {
+            if ((result = getMajorVersionValue().compareTo(o.getMajorVersionValue())) != 0) {
                 return result;
             }
             if ((result = getMinorVersion().compareTo(o.getMinorVersion())) != 0) {

diff --git a/commons/commons-velocity-api/pom.xml b/commons/commons-velocity-api/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>kylo-commons</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
   <properties>
     <plugin.license.parentRelative>../../</plugin.license.parentRelative>

diff --git a/commons/commons-velocity-core/pom.xml b/commons/commons-velocity-core/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>kylo-commons</artifactId>
     <groupId>com.thinkbiganalytics.kylo</groupId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
   <properties>
     <plugin.license.parentRelative>../../</plugin.license.parentRelative>

diff --git a/commons/pom.xml b/commons/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.thinkbiganalytics.kylo</groupId>
     <artifactId>kylo</artifactId>
-    <version>0.9.2-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kylo-commons</artifactId>