You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by xx...@apache.org on 2021/05/08 04:08:37 UTC

[kylin] branch master updated (1c41baf -> b3fad40)

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git.


    from 1c41baf  KYLIN-4979 Fix flink shaded jar version error in download-flink.sh
     new d450380  KYLIN-4591 exclude external module
     new daf44dd  [maven-release-plugin] prepare release kylin-3.1.2
     new 9a12393  [maven-release-plugin] prepare for next development iteration
     new b3fad40  Reset external module

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 assembly/pom.xml               |  2 +-
 build/bin/set-kylin-home.sh    | 18 ++++++++++++++++++
 cache/pom.xml                  |  2 +-
 core-common/pom.xml            |  2 +-
 core-cube/pom.xml              |  2 +-
 core-dictionary/pom.xml        |  2 +-
 core-job/pom.xml               |  2 +-
 core-metadata/pom.xml          |  2 +-
 core-metrics/pom.xml           |  2 +-
 core-storage/pom.xml           |  2 +-
 cube-migration/pom.xml         |  2 +-
 datasource-sdk/pom.xml         |  2 +-
 engine-flink/pom.xml           |  2 +-
 engine-mr/pom.xml              |  2 +-
 engine-spark/pom.xml           |  2 +-
 external/pom.xml               |  2 +-
 external/shaded-guava/pom.xml  |  2 +-
 jdbc/pom.xml                   |  2 +-
 kylin-it/pom.xml               |  2 +-
 metrics-reporter-hive/pom.xml  |  2 +-
 metrics-reporter-kafka/pom.xml |  2 +-
 pom.xml                        |  4 ++--
 query/pom.xml                  |  5 ++---
 server-base/pom.xml            |  2 +-
 server/pom.xml                 |  2 +-
 source-hive/pom.xml            |  2 +-
 source-jdbc/pom.xml            |  2 +-
 source-kafka/pom.xml           |  2 +-
 storage-hbase/pom.xml          |  2 +-
 storage-stream/pom.xml         |  2 +-
 stream-coordinator/pom.xml     |  2 +-
 stream-core/pom.xml            |  2 +-
 stream-receiver/pom.xml        |  2 +-
 stream-source-kafka/pom.xml    |  2 +-
 tomcat-ext/pom.xml             |  2 +-
 tool-assembly/pom.xml          |  2 +-
 tool/pom.xml                   |  2 +-
 37 files changed, 56 insertions(+), 39 deletions(-)

[kylin] 04/04: Reset external module

Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit b3fad403271ca400f06c644503c5121184f582a1
Author: XiaoxiangYu <xx...@apache.org>
AuthorDate: Sat May 8 10:10:04 2021 +0800

    Reset external module
---
 external/pom.xml              | 2 +-
 external/shaded-guava/pom.xml | 2 +-
 pom.xml                       | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/external/pom.xml b/external/pom.xml
index 2c35635..35a7565 100644
--- a/external/pom.xml
+++ b/external/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/external/shaded-guava/pom.xml b/external/shaded-guava/pom.xml
index 79c0115..589fe76 100644
--- a/external/shaded-guava/pom.xml
+++ b/external/shaded-guava/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 1d2b055..abf8d1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,7 +248,7 @@
       <dependency>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin-shaded-guava</artifactId>
-        <version>3.1.0</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.kylin</groupId>
@@ -1362,6 +1362,7 @@
   </build>
 
   <modules>
+    <module>external</module>
     <module>core-common</module>
     <module>core-metadata</module>
     <module>core-dictionary</module>

[kylin] 02/04: [maven-release-plugin] prepare release kylin-3.1.2

Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit daf44dd95d1451f454d540bc3a0774a2fb89a032
Author: nichunen <ni...@apache.org>
AuthorDate: Sun Apr 18 22:18:06 2021 +0000

    [maven-release-plugin] prepare release kylin-3.1.2
---
 assembly/pom.xml               | 2 +-
 cache/pom.xml                  | 2 +-
 core-common/pom.xml            | 2 +-
 core-cube/pom.xml              | 2 +-
 core-dictionary/pom.xml        | 2 +-
 core-job/pom.xml               | 2 +-
 core-metadata/pom.xml          | 2 +-
 core-metrics/pom.xml           | 2 +-
 core-storage/pom.xml           | 2 +-
 cube-migration/pom.xml         | 2 +-
 datasource-sdk/pom.xml         | 2 +-
 engine-flink/pom.xml           | 2 +-
 engine-mr/pom.xml              | 2 +-
 engine-spark/pom.xml           | 2 +-
 jdbc/pom.xml                   | 2 +-
 kylin-it/pom.xml               | 2 +-
 metrics-reporter-hive/pom.xml  | 2 +-
 metrics-reporter-kafka/pom.xml | 2 +-
 pom.xml                        | 4 ++--
 query/pom.xml                  | 5 ++---
 server-base/pom.xml            | 2 +-
 server/pom.xml                 | 2 +-
 source-hive/pom.xml            | 2 +-
 source-jdbc/pom.xml            | 2 +-
 source-kafka/pom.xml           | 2 +-
 storage-hbase/pom.xml          | 2 +-
 storage-stream/pom.xml         | 2 +-
 stream-coordinator/pom.xml     | 2 +-
 stream-core/pom.xml            | 2 +-
 stream-receiver/pom.xml        | 2 +-
 stream-source-kafka/pom.xml    | 2 +-
 tomcat-ext/pom.xml             | 2 +-
 tool-assembly/pom.xml          | 2 +-
 tool/pom.xml                   | 2 +-
 34 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7628388..b622b30 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <properties>
diff --git a/cache/pom.xml b/cache/pom.xml
index 7a13f70..64ad8cf 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/core-common/pom.xml b/core-common/pom.xml
index 398ebde..5a5aad9 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/core-cube/pom.xml b/core-cube/pom.xml
index d6071b1..5fa47aa 100644
--- a/core-cube/pom.xml
+++ b/core-cube/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml
index 684c6e4..c9206f8 100644
--- a/core-dictionary/pom.xml
+++ b/core-dictionary/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/core-job/pom.xml b/core-job/pom.xml
index e2cb675..da82c12 100644
--- a/core-job/pom.xml
+++ b/core-job/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml
index c973285..eaa93c3 100644
--- a/core-metadata/pom.xml
+++ b/core-metadata/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
     <dependencies>
 
diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml
index b622064..b2e2bdb 100644
--- a/core-metrics/pom.xml
+++ b/core-metrics/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/core-storage/pom.xml b/core-storage/pom.xml
index 5abc721..e07d00a 100644
--- a/core-storage/pom.xml
+++ b/core-storage/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
     <dependencies>
 
diff --git a/cube-migration/pom.xml b/cube-migration/pom.xml
index f733f39..8900ea8 100755
--- a/cube-migration/pom.xml
+++ b/cube-migration/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/datasource-sdk/pom.xml b/datasource-sdk/pom.xml
index 49656b5..25294af 100644
--- a/datasource-sdk/pom.xml
+++ b/datasource-sdk/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/engine-flink/pom.xml b/engine-flink/pom.xml
index 8c2236e..3db0aff 100644
--- a/engine-flink/pom.xml
+++ b/engine-flink/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml
index 3bc48d9..12ab020 100644
--- a/engine-mr/pom.xml
+++ b/engine-mr/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml
index 1a44c5c..5e90231 100644
--- a/engine-spark/pom.xml
+++ b/engine-spark/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 46040f5..6108be6 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <properties>
diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml
index 863056d..10def19 100644
--- a/kylin-it/pom.xml
+++ b/kylin-it/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <properties>
diff --git a/metrics-reporter-hive/pom.xml b/metrics-reporter-hive/pom.xml
index 7d0f7d5..a4398d1 100644
--- a/metrics-reporter-hive/pom.xml
+++ b/metrics-reporter-hive/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/metrics-reporter-kafka/pom.xml b/metrics-reporter-kafka/pom.xml
index b4ae67f..db84d9b 100644
--- a/metrics-reporter-kafka/pom.xml
+++ b/metrics-reporter-kafka/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 57fe46c..480c1fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
   <groupId>org.apache.kylin</groupId>
   <artifactId>kylin</artifactId>
   <packaging>pom</packaging>
-  <version>3.1.2-SNAPSHOT</version>
+  <version>3.1.2</version>
 
   <name>Apache Kylin</name>
   <url>http://kylin.apache.org</url>
@@ -234,7 +234,7 @@
     <developerConnection>scm:git:ssh://git@github.com/apache/kylin.git
     </developerConnection>
     <url>https://github.com/apache/kylin</url>
-    <tag>HEAD</tag>
+    <tag>kylin-3.1.2</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/query/pom.xml b/query/pom.xml
index a9f9358..7403ba6 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -17,8 +17,7 @@
  limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>kylin-query</artifactId>
@@ -29,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/server-base/pom.xml b/server-base/pom.xml
index 6d32db2..504d24c 100644
--- a/server-base/pom.xml
+++ b/server-base/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/server/pom.xml b/server/pom.xml
index 21bb08c..b61e68c 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/source-hive/pom.xml b/source-hive/pom.xml
index 0822a9c..7865eab 100644
--- a/source-hive/pom.xml
+++ b/source-hive/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/source-jdbc/pom.xml b/source-jdbc/pom.xml
index df9e747..d89a754 100644
--- a/source-jdbc/pom.xml
+++ b/source-jdbc/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml
index 7fbda14..b703785 100644
--- a/source-kafka/pom.xml
+++ b/source-kafka/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/storage-hbase/pom.xml b/storage-hbase/pom.xml
index 4ae15de..7f9101e 100644
--- a/storage-hbase/pom.xml
+++ b/storage-hbase/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <properties>
diff --git a/storage-stream/pom.xml b/storage-stream/pom.xml
index 679cf29..49492af 100644
--- a/storage-stream/pom.xml
+++ b/storage-stream/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kylin-storage-stream</artifactId>
diff --git a/stream-coordinator/pom.xml b/stream-coordinator/pom.xml
index fae771d..b6ccdfc 100644
--- a/stream-coordinator/pom.xml
+++ b/stream-coordinator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kylin-stream-coordinator</artifactId>
diff --git a/stream-core/pom.xml b/stream-core/pom.xml
index b3552fd..742069f 100644
--- a/stream-core/pom.xml
+++ b/stream-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kylin-stream-core</artifactId>
diff --git a/stream-receiver/pom.xml b/stream-receiver/pom.xml
index 5081957..2eab51c 100644
--- a/stream-receiver/pom.xml
+++ b/stream-receiver/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kylin-stream-receiver</artifactId>
diff --git a/stream-source-kafka/pom.xml b/stream-source-kafka/pom.xml
index 12b05d8..b18c174 100644
--- a/stream-source-kafka/pom.xml
+++ b/stream-source-kafka/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kylin-stream-source-kafka</artifactId>
diff --git a/tomcat-ext/pom.xml b/tomcat-ext/pom.xml
index c298222..b9b6bf0 100644
--- a/tomcat-ext/pom.xml
+++ b/tomcat-ext/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <dependencies>
diff --git a/tool-assembly/pom.xml b/tool-assembly/pom.xml
index 216f610..6a18002 100644
--- a/tool-assembly/pom.xml
+++ b/tool-assembly/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <properties>
diff --git a/tool/pom.xml b/tool/pom.xml
index d3bdeb9..5a945c2 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.2</version>
     </parent>
 
     <properties>

[kylin] 03/04: [maven-release-plugin] prepare for next development iteration

Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 9a1239346e183be8bfa3461d4be3c6a8f6948ea0
Author: nichunen <ni...@apache.org>
AuthorDate: Sun Apr 18 22:18:22 2021 +0000

    [maven-release-plugin] prepare for next development iteration
---
 assembly/pom.xml               | 2 +-
 cache/pom.xml                  | 2 +-
 core-common/pom.xml            | 2 +-
 core-cube/pom.xml              | 2 +-
 core-dictionary/pom.xml        | 2 +-
 core-job/pom.xml               | 2 +-
 core-metadata/pom.xml          | 2 +-
 core-metrics/pom.xml           | 2 +-
 core-storage/pom.xml           | 2 +-
 cube-migration/pom.xml         | 2 +-
 datasource-sdk/pom.xml         | 2 +-
 engine-flink/pom.xml           | 2 +-
 engine-mr/pom.xml              | 2 +-
 engine-spark/pom.xml           | 2 +-
 jdbc/pom.xml                   | 2 +-
 kylin-it/pom.xml               | 2 +-
 metrics-reporter-hive/pom.xml  | 2 +-
 metrics-reporter-kafka/pom.xml | 2 +-
 pom.xml                        | 4 ++--
 query/pom.xml                  | 2 +-
 server-base/pom.xml            | 2 +-
 server/pom.xml                 | 2 +-
 source-hive/pom.xml            | 2 +-
 source-jdbc/pom.xml            | 2 +-
 source-kafka/pom.xml           | 2 +-
 storage-hbase/pom.xml          | 2 +-
 storage-stream/pom.xml         | 2 +-
 stream-coordinator/pom.xml     | 2 +-
 stream-core/pom.xml            | 2 +-
 stream-receiver/pom.xml        | 2 +-
 stream-source-kafka/pom.xml    | 2 +-
 tomcat-ext/pom.xml             | 2 +-
 tool-assembly/pom.xml          | 2 +-
 tool/pom.xml                   | 2 +-
 34 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index b622b30..201a3ee 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/cache/pom.xml b/cache/pom.xml
index 64ad8cf..f85d084 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/core-common/pom.xml b/core-common/pom.xml
index 5a5aad9..c9750ca 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/core-cube/pom.xml b/core-cube/pom.xml
index 5fa47aa..2a2bff2 100644
--- a/core-cube/pom.xml
+++ b/core-cube/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml
index c9206f8..b279147 100644
--- a/core-dictionary/pom.xml
+++ b/core-dictionary/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/core-job/pom.xml b/core-job/pom.xml
index da82c12..127266e 100644
--- a/core-job/pom.xml
+++ b/core-job/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml
index eaa93c3..335312b 100644
--- a/core-metadata/pom.xml
+++ b/core-metadata/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
     <dependencies>
 
diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml
index b2e2bdb..b956aa2 100644
--- a/core-metrics/pom.xml
+++ b/core-metrics/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/core-storage/pom.xml b/core-storage/pom.xml
index e07d00a..d0ba407 100644
--- a/core-storage/pom.xml
+++ b/core-storage/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
     <dependencies>
 
diff --git a/cube-migration/pom.xml b/cube-migration/pom.xml
index 8900ea8..6b26c14 100755
--- a/cube-migration/pom.xml
+++ b/cube-migration/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/datasource-sdk/pom.xml b/datasource-sdk/pom.xml
index 25294af..055f8a1 100644
--- a/datasource-sdk/pom.xml
+++ b/datasource-sdk/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/engine-flink/pom.xml b/engine-flink/pom.xml
index 3db0aff..3066885 100644
--- a/engine-flink/pom.xml
+++ b/engine-flink/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml
index 12ab020..5c0cd4b 100644
--- a/engine-mr/pom.xml
+++ b/engine-mr/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml
index 5e90231..d46d844 100644
--- a/engine-spark/pom.xml
+++ b/engine-spark/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 6108be6..060668f 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml
index 10def19..c288356 100644
--- a/kylin-it/pom.xml
+++ b/kylin-it/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/metrics-reporter-hive/pom.xml b/metrics-reporter-hive/pom.xml
index a4398d1..c7a4e67 100644
--- a/metrics-reporter-hive/pom.xml
+++ b/metrics-reporter-hive/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/metrics-reporter-kafka/pom.xml b/metrics-reporter-kafka/pom.xml
index db84d9b..0c57394 100644
--- a/metrics-reporter-kafka/pom.xml
+++ b/metrics-reporter-kafka/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 480c1fd..1d2b055 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
   <groupId>org.apache.kylin</groupId>
   <artifactId>kylin</artifactId>
   <packaging>pom</packaging>
-  <version>3.1.2</version>
+  <version>3.1.3-SNAPSHOT</version>
 
   <name>Apache Kylin</name>
   <url>http://kylin.apache.org</url>
@@ -234,7 +234,7 @@
     <developerConnection>scm:git:ssh://git@github.com/apache/kylin.git
     </developerConnection>
     <url>https://github.com/apache/kylin</url>
-    <tag>kylin-3.1.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencyManagement>
diff --git a/query/pom.xml b/query/pom.xml
index 7403ba6..9af1820 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/server-base/pom.xml b/server-base/pom.xml
index 504d24c..9dcfd78 100644
--- a/server-base/pom.xml
+++ b/server-base/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/server/pom.xml b/server/pom.xml
index b61e68c..4778391 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/source-hive/pom.xml b/source-hive/pom.xml
index 7865eab..81dee4f 100644
--- a/source-hive/pom.xml
+++ b/source-hive/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/source-jdbc/pom.xml b/source-jdbc/pom.xml
index d89a754..06c15dd 100644
--- a/source-jdbc/pom.xml
+++ b/source-jdbc/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml
index b703785..fa31536 100644
--- a/source-kafka/pom.xml
+++ b/source-kafka/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/storage-hbase/pom.xml b/storage-hbase/pom.xml
index 7f9101e..51ac549 100644
--- a/storage-hbase/pom.xml
+++ b/storage-hbase/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/storage-stream/pom.xml b/storage-stream/pom.xml
index 49492af..6aab6b9 100644
--- a/storage-stream/pom.xml
+++ b/storage-stream/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kylin-storage-stream</artifactId>
diff --git a/stream-coordinator/pom.xml b/stream-coordinator/pom.xml
index b6ccdfc..e513e4c 100644
--- a/stream-coordinator/pom.xml
+++ b/stream-coordinator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kylin-stream-coordinator</artifactId>
diff --git a/stream-core/pom.xml b/stream-core/pom.xml
index 742069f..e1e2311 100644
--- a/stream-core/pom.xml
+++ b/stream-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kylin-stream-core</artifactId>
diff --git a/stream-receiver/pom.xml b/stream-receiver/pom.xml
index 2eab51c..70da34a 100644
--- a/stream-receiver/pom.xml
+++ b/stream-receiver/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kylin-stream-receiver</artifactId>
diff --git a/stream-source-kafka/pom.xml b/stream-source-kafka/pom.xml
index b18c174..5196583 100644
--- a/stream-source-kafka/pom.xml
+++ b/stream-source-kafka/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kylin-stream-source-kafka</artifactId>
diff --git a/tomcat-ext/pom.xml b/tomcat-ext/pom.xml
index b9b6bf0..7763b8f 100644
--- a/tomcat-ext/pom.xml
+++ b/tomcat-ext/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/tool-assembly/pom.xml b/tool-assembly/pom.xml
index 6a18002..8e13976 100644
--- a/tool-assembly/pom.xml
+++ b/tool-assembly/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/tool/pom.xml b/tool/pom.xml
index 5a945c2..af23b0c 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-SNAPSHOT</version>
     </parent>
 
     <properties>

[kylin] 01/04: KYLIN-4591 exclude external module

Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit d45038077eb6235cfd2c405491fa31600f80deb2
Author: nichunen <ni...@apache.org>
AuthorDate: Tue Apr 13 12:42:28 2021 +0000

    KYLIN-4591 exclude external module
---
 build/bin/set-kylin-home.sh | 18 ++++++++++++++++++
 pom.xml                     |  5 ++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/build/bin/set-kylin-home.sh b/build/bin/set-kylin-home.sh
index d228bcb..93dbc96 100644
--- a/build/bin/set-kylin-home.sh
+++ b/build/bin/set-kylin-home.sh
@@ -1,3 +1,21 @@
+#!/bin/bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 if [ -z $KYLIN_HOME ];
 then
     export KYLIN_HOME=`cd -P -- "$(dirname -- "$0")" && dirname $(pwd)`
diff --git a/pom.xml b/pom.xml
index ed14a73..57fe46c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,7 +248,7 @@
       <dependency>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin-shaded-guava</artifactId>
-        <version>${project.version}</version>
+        <version>3.1.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.kylin</groupId>
@@ -1362,7 +1362,6 @@
   </build>
 
   <modules>
-    <module>external</module>
     <module>core-common</module>
     <module>core-metadata</module>
     <module>core-dictionary</module>
@@ -1848,7 +1847,7 @@
                 <exclude>**/*.isl</exclude>
                 <exclude>**/*.isproj</exclude>
                 <exclude>**/*.bmp</exclude>
-
+                <exclude>**/*/CommentParser.jj</exclude>
                 <!-- protobuf generated -->
                 <exclude>
                   src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/generated/IIProtos.java