update pom verison number according to branch renaming

11figure · Mar 10, 2016 · 12d5458 · 12d5458
1 parent 0543dc9
commit 12d5458
Show file tree

Hide file tree

Showing 66 changed files with 66 additions and 72 deletions.
diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>2.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
 
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/core-common/pom.xml b/core-common/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
 
     </parent>
 

diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java b/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
@@ -16,16 +16,12 @@
  */
 package org.apache.kylin.common;
 
-/**
- * Current version is: 2.1
- *
- * @since 2.1
- */
+
 public class KylinVersion {
     /**
      * Require MANUAL updating kylin version per ANY upgrading.
      */
-    private static final String CURRENT_KYLIN_VERSION = "2.1";
+    private static final String CURRENT_KYLIN_VERSION = "1.5.0";
 
     /**
      * Get current Kylin version

diff --git a/core-common/src/main/java/org/apache/kylin/common/persistence/RootPersistentEntity.java b/core-common/src/main/java/org/apache/kylin/common/persistence/RootPersistentEntity.java
@@ -76,8 +76,6 @@ public static long parseTime(String timeString) {
      * Metadata model version
      *
      * User info only, we don't do version control
-     *
-     * For example: 2.1
      */
     @JsonProperty("version")
     protected String version = KylinVersion.getCurrentVersion();

diff --git a/core-cube/pom.xml b/core-cube/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
 
     </parent>
 

diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
 
     </parent>
 

diff --git a/core-job/pom.xml b/core-job/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
 
     </parent>
 

diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
 
     </parent>
 

diff --git a/core-storage/pom.xml b/core-storage/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
 
     </parent>
 

diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
 
     </parent>
 

diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
 
     </parent>
 

diff --git a/engine-streaming/pom.xml b/engine-streaming/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
 
     </parent>
 

diff --git a/examples/sample_cube/metadata/cube/kylin_sales_cube.json b/examples/sample_cube/metadata/cube/kylin_sales_cube.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "2fbca32a-a33e-4b69-83dd-0bb8b1f8c53b",
-  "version":"2.1",
+
   "last_modified" : 0,
   "name" : "kylin_sales_cube",
   "owner" : null,

diff --git a/examples/sample_cube/metadata/cube_desc/kylin_sales_cube_desc.json b/examples/sample_cube/metadata/cube_desc/kylin_sales_cube_desc.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "0ef9b7a8-3929-4dff-b59d-2100aadc8dbf",
-  "version":"2.1",
+
   "name" : "kylin_sales_cube_desc",
   "description" : null,
   "dimensions" : [ {

diff --git a/examples/sample_cube/metadata/model_desc/kylin_sales_model.json b/examples/sample_cube/metadata/model_desc/kylin_sales_model.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "0928468a-9fab-4185-9a14-6f2e7c74823f",
-  "version":"2.1",
+
   "name" : "kylin_sales_model",
   "lookups" : [ {
     "table" : "DEFAULT.KYLIN_CAL_DT",

diff --git a/examples/sample_cube/metadata/project/learn_kylin.json b/examples/sample_cube/metadata/project/learn_kylin.json
@@ -1,6 +1,6 @@
 {
   "uuid": "1eaca32a-a33e-4b69-83dd-0bb8b1f8c91b",
-  "version":"2.1",
+
   "name": "learn_kylin",
   "realizations": [
     {

diff --git a/examples/sample_cube/metadata/table/DEFAULT.KYLIN_CAL_DT.json b/examples/sample_cube/metadata/table/DEFAULT.KYLIN_CAL_DT.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "0ff420eb-79ad-40bd-bca9-12d8cd05c60a",
-  "version":"2.1",
+
   "name" : "KYLIN_CAL_DT",
   "columns" : [ {
     "id" : "1",

diff --git a/examples/sample_cube/metadata/table/DEFAULT.KYLIN_CATEGORY_GROUPINGS.json b/examples/sample_cube/metadata/table/DEFAULT.KYLIN_CATEGORY_GROUPINGS.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "952d11b5-69d9-45d1-92af-227489485e3f",
-  "version":"2.1",
+
   "name" : "KYLIN_CATEGORY_GROUPINGS",
   "columns" : [ {
     "id" : "1",

diff --git a/examples/sample_cube/metadata/table/DEFAULT.KYLIN_SALES.json b/examples/sample_cube/metadata/table/DEFAULT.KYLIN_SALES.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "e286e39e-40d7-44c2-8fa2-41b365522771",
-  "version":"2.1",
+
   "name" : "KYLIN_SALES",
   "columns" : [ {
     "id" : "1",

diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_1_new_segment.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_1_new_segment.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "111ca32a-a33e-4b69-83dd-0bb8b1f8c53b",
-  "version":"2.1",
+
   "last_modified" : 1404098141020,
   "name" : "test_kylin_cube_with_slr_1_new_segment",
   "owner" : null,

diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_empty.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_empty.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "1eaca32a-a33e-4b69-83dd-0bb8b1f8c53b",
-  "version":"2.1",
+
   "last_modified" : 0,
   "name" : "test_kylin_cube_with_slr_empty",
   "owner" : null,

diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_left_join_empty.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_left_join_empty.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "1eaca32a-a33e-4b69-83dd-0bb8b1f8dddd",
-  "version":"2.1",
+
   "last_modified" : 0,
   "name" : "test_kylin_cube_with_slr_left_join_empty",
   "owner" : null,

diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_left_join_ready.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_left_join_ready.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "kkkka32a-a33e-4b69-83dd-0bb8b1f8c53b",
-  "version":"2.1",
+
   "last_modified" : 1404097095621,
   "name" : "test_kylin_cube_with_slr_left_join_ready",
   "owner" : null,

diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_ready.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_ready.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "1eaca32a-a33e-4b69-83dd-0bb8b1f8c53b",
-  "version":"2.1",
+
   "last_modified" : 1404098141020,
   "name" : "test_kylin_cube_with_slr_ready",
   "owner" : null,

diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_ready_2_segments.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_ready_2_segments.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "1eaca32a-a33e-4b69-83dd-0bb8b1f8c53c",
-  "version":"2.1",
+
   "last_modified" : 1404098141020,
   "name" : "test_kylin_cube_with_slr_ready_2_segments",
   "owner" : null,

diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_without_slr_empty.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_without_slr_empty.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "daa53e80-41be-49a5-90ca-9fb7294db186",
-  "version":"2.1",
+
   "last_modified" : 0,
   "name" : "test_kylin_cube_without_slr_empty",
   "owner" : null,

diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_without_slr_left_join_empty.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_without_slr_left_join_empty.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "dddd3e80-41be-49a5-90ca-9fb7294db186",
-  "version":"2.1",
+
   "last_modified" : 0,
   "name" : "test_kylin_cube_without_slr_left_join_empty",
   "owner" : null,

diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_without_slr_left_join_ready.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_without_slr_left_join_ready.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "mmmm3e80-41be-49a5-90ca-9fb7294db186",
-  "version":"2.1",
+
   "last_modified" : 1404097288087,
   "name" : "test_kylin_cube_without_slr_left_join_ready",
   "owner" : null,

diff --git a/...test_case_data/localmeta/cube/test_kylin_cube_without_slr_left_join_ready_2_segments.json b/...test_case_data/localmeta/cube/test_kylin_cube_without_slr_left_join_ready_2_segments.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "1eaca32a-a33e-4b69-83dd-0bb8b1f8c5ff",
-  "version":"2.1",
+
   "last_modified" : 1404098141020,
   "name" : "test_kylin_cube_without_slr_left_join_ready_2_segments",
   "owner" : null,

diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_without_slr_ready.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_without_slr_ready.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "daa53e80-41be-49a5-90ca-9fb7294db186",
-  "version":"2.1",
+
   "last_modified" : 1404098303976,
   "name" : "test_kylin_cube_without_slr_ready",
   "owner" : null,

diff --git a/examples/test_case_data/localmeta/cube/test_streaming_table_cube.json b/examples/test_case_data/localmeta/cube/test_streaming_table_cube.json
@@ -1,6 +1,6 @@
 {
   "uuid": "40a27d9d-c5f3-45c4-9b8b-503552419193",
-  "version":"2.1",
+
   "name": "test_streaming_table_cube",
   "owner": "ADMIN",
   "cost": 50,

diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_desc.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "a24ca905-1fc6-4f67-985c-38fa5aeafd92",
-  "version":"2.1",
+
   "name" : "test_kylin_cube_with_slr_desc",
   "description" : null,
   "dimensions" : [ {

diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "bbbba905-1fc6-4f67-985c-38fa5aeafd92",
-  "version":"2.1",
+
   "name" : "test_kylin_cube_with_slr_left_join_desc",
   "description" : null,
   "dimensions" : [ {

diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_desc.json
@@ -1,6 +1,6 @@
 
 {
-  "version":"2.1",
+
   "uuid": "9ac9b7a8-3929-4dff-b59d-2100aadc8dbf",
   "name": "test_kylin_cube_without_slr_desc",
   "description": null,

diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "9ac9b7a8-3929-4dff-b59d-2100aadc8dbf",
-  "version":"2.1",
+
   "name" : "test_kylin_cube_without_slr_left_join_desc",
   "description" : null,
   "dimensions" : [ {

diff --git a/examples/test_case_data/localmeta/cube_desc/test_streaming_table_cube_desc.json b/examples/test_case_data/localmeta/cube_desc/test_streaming_table_cube_desc.json
@@ -1,6 +1,6 @@
 {
   "uuid" : "901ed15e-7769-4c66-b7ae-fbdc971cd192",
-  "version":"2.1",
+
   "name" : "test_streaming_table_cube_desc",
   "description" : "",
   "dimensions" : [ {

diff --git a/examples/test_case_data/localmeta/hybrid/test_kylin_hybrid_inner_join.json b/examples/test_case_data/localmeta/hybrid/test_kylin_hybrid_inner_join.json
@@ -1,6 +1,6 @@
 {
   "uuid": "9iiu8590-64b6-4367-8fb5-7500eb95fd9c",
-  "version":"2.1",
+
   "name": "test_kylin_hybrid_inner_join",
   "realizations": [
     {

diff --git a/examples/test_case_data/localmeta/hybrid/test_kylin_hybrid_left_join.json b/examples/test_case_data/localmeta/hybrid/test_kylin_hybrid_left_join.json
@@ -1,6 +1,6 @@
 {
   "uuid": "5ca78590-64b6-4367-8fb5-7500eb95fd9c",
-  "version":"2.1",
+
   "name": "test_kylin_hybrid_left_join",
   "realizations": [
     {

diff --git a/examples/test_case_data/localmeta/hybrid/test_kylin_hybrid_ready.json b/examples/test_case_data/localmeta/hybrid/test_kylin_hybrid_ready.json
@@ -1,6 +1,6 @@
 {
   "uuid": "9iiu8590-64b6-4367-8fb5-7500eb95fd9c",
-  "version":"2.1",
+
   "name": "test_kylin_hybrid_ready",
   "realizations": [
     {

diff --git a/examples/test_case_data/localmeta/invertedindex/test_kylin_ii_inner_join.json b/examples/test_case_data/localmeta/invertedindex/test_kylin_ii_inner_join.json
@@ -1,5 +1,5 @@
 {
-  "model_version":"2.1",
+
   "uuid": "dk853e80-41be-49a5-89ca-9fb7294db186",
   "name": "test_kylin_ii_inner_join",
   "owner": null,

diff --git a/examples/test_case_data/localmeta/invertedindex/test_kylin_ii_left_join.json b/examples/test_case_data/localmeta/invertedindex/test_kylin_ii_left_join.json
@@ -1,5 +1,5 @@
 {
-  "version":"2.1",
+
   "uuid": "daa53e80-41be-49a5-89ca-9fb7294db186",
   "name": "test_kylin_ii_left_join",
   "owner": null,

diff --git a/examples/test_case_data/localmeta/invertedindex/test_streaming_table_ii.json b/examples/test_case_data/localmeta/invertedindex/test_streaming_table_ii.json
@@ -1,5 +1,5 @@
 {
-  "version":"2.1",
+
   "uuid": "daa53e80-41be-49a5-89ca-9fb729999812",
   "name": "test_streaming_table_ii",
   "owner": null,

diff --git a/examples/test_case_data/localmeta/invertedindex_desc/test_kylin_ii_inner_join_desc.json b/examples/test_case_data/localmeta/invertedindex_desc/test_kylin_ii_inner_join_desc.json
@@ -1,5 +1,5 @@
 {
-  "version":"2.1",
+
   "uuid": "88bf87b5-c7b5-4420-a12a-07f6b37b3187",
   "last_modified": 0,
   "name": "test_kylin_ii_inner_join_desc",

diff --git a/examples/test_case_data/localmeta/invertedindex_desc/test_kylin_ii_left_join_desc.json b/examples/test_case_data/localmeta/invertedindex_desc/test_kylin_ii_left_join_desc.json
@@ -1,5 +1,5 @@
 {
-  "version":"2.1",
+
   "uuid": "74bf87b5-c7b5-4420-a12a-07f6b37b3187",
   "last_modified": 0,
   "name": "test_kylin_ii_left_join_desc",

diff --git a/examples/test_case_data/localmeta/invertedindex_desc/test_streaming_table_ii_desc.json b/examples/test_case_data/localmeta/invertedindex_desc/test_streaming_table_ii_desc.json
@@ -1,5 +1,5 @@
 {
-  "version":"2.1",
+
   "uuid": "74bf87b5-c7b5-4420-a12a-07f6b3864789",
   "last_modified": 0,
   "name": "test_streaming_table_ii_desc",

diff --git a/examples/test_case_data/localmeta/kafka/default.streaming_table.json b/examples/test_case_data/localmeta/kafka/default.streaming_table.json
@@ -1,5 +1,5 @@
 {
-  "version":"2.1",
+
   "uuid": "8b2b9dfe-777c-4d39-bf89-8472ec909193",
   "name": "default.streaming_table",
   "topic": "test_streaming_table_topic_xyz",

diff --git a/examples/test_case_data/localmeta/model_desc/test_kylin_inner_join_model_desc.json b/examples/test_case_data/localmeta/model_desc/test_kylin_inner_join_model_desc.json
@@ -1,5 +1,5 @@
 {
-  "version":"2.1",
+
   "uuid" : "ff527b94-f860-44c3-8452-93b17774c647",
   "name" : "test_kylin_inner_join_model_desc",
   "lookups" : [ {