You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2020/10/13 09:20:11 UTC

[kylin] branch master-hadoop3 updated (d8af2c8 -> e8b357f)

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

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


    from d8af2c8  Revert "KYLIN-4508 Add unit test for core-metrics module & reporters"
     new 308f1a1  prepare release kylin-3.1.1
     new e8b357f  Resolve shaded-guava

The 2 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 +-
 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               | 9 +--------
 jdbc/pom.xml                   | 2 +-
 kylin-it/pom.xml               | 2 +-
 metrics-reporter-hive/pom.xml  | 2 +-
 metrics-reporter-kafka/pom.xml | 2 +-
 pom.xml                        | 7 +++----
 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 +-
 35 files changed, 37 insertions(+), 45 deletions(-)


[kylin] 02/02: Resolve shaded-guava

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

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

commit e8b357fef6df242584c50a1751c7c52203590655
Author: nichunen <ni...@apache.org>
AuthorDate: Tue Oct 13 09:19:03 2020 +0000

    Resolve shaded-guava
---
 external/pom.xml | 9 +--------
 pom.xml          | 5 ++---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/external/pom.xml b/external/pom.xml
index 8c45fd3..5fa2e62 100644
--- a/external/pom.xml
+++ b/external/pom.xml
@@ -25,13 +25,6 @@
     <name>Apache Kylin - kylin External</name>
     <description>Apache Kylin - External</description>
 
-    <parent>
-        <artifactId>kylin</artifactId>
-        <groupId>org.apache.kylin</groupId>
-        <version>3.1.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
     <build>
         <plugins>
             <plugin>
@@ -69,4 +62,4 @@
 
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index e6fee04..fdaaf17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,7 +249,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>
@@ -1453,7 +1453,6 @@
     </build>
 
     <modules>
-        <module>external</module>
         <module>core-common</module>
         <module>core-metadata</module>
         <module>core-dictionary</module>
@@ -2035,4 +2034,4 @@
             </build>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>


[kylin] 01/02: prepare release kylin-3.1.1

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

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

commit 308f1a1631f9bd349340a8b23353bb8569251652
Author: XiaoxiangYu <xx...@apache.org>
AuthorDate: Tue Oct 13 16:08:22 2020 +0800

    prepare release kylin-3.1.1
---
 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                        | 2 +-
 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, 34 insertions(+), 34 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 42e1ff8..888f21b 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <properties>
diff --git a/cache/pom.xml b/cache/pom.xml
index cc572dc..87816e3 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/core-common/pom.xml b/core-common/pom.xml
index bff8797..82315ac 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/core-cube/pom.xml b/core-cube/pom.xml
index 7828ccd..ed6f7ff 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml
index a079566..9ae9722 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/core-job/pom.xml b/core-job/pom.xml
index cf2e4c9..4ad685f 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml
index 3e05f0f..02ae49a 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
     <dependencies>
 
diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml
index 654199e..0fb5057 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/core-storage/pom.xml b/core-storage/pom.xml
index ebbadda..9ddfd7e 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
     <dependencies>
 
diff --git a/cube-migration/pom.xml b/cube-migration/pom.xml
index 8c24745..28d07ef 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/datasource-sdk/pom.xml b/datasource-sdk/pom.xml
index fb472a0..0622400 100644
--- a/datasource-sdk/pom.xml
+++ b/datasource-sdk/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/engine-flink/pom.xml b/engine-flink/pom.xml
index 1dab365..36e9dbd 100644
--- a/engine-flink/pom.xml
+++ b/engine-flink/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml
index 534e2df..01ffdc3 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml
index c7a0be4..8f29ce6 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 34efb6a..e39df43 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <properties>
diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml
index 0021b8a..6430602 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <properties>
diff --git a/metrics-reporter-hive/pom.xml b/metrics-reporter-hive/pom.xml
index 0159804..04e9637 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/metrics-reporter-kafka/pom.xml b/metrics-reporter-kafka/pom.xml
index 173febdc..9f45827 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index b72025c..e6fee04 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.1-SNAPSHOT</version>
+    <version>3.1.1</version>
 
     <name>Apache Kylin</name>
     <url>http://kylin.apache.org</url>
diff --git a/query/pom.xml b/query/pom.xml
index da7030d..fcef253 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/server-base/pom.xml b/server-base/pom.xml
index f98fa07..58c1d68 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/server/pom.xml b/server/pom.xml
index c0032fd..9107385 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/source-hive/pom.xml b/source-hive/pom.xml
index 648c608..1d7751b 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/source-jdbc/pom.xml b/source-jdbc/pom.xml
index 60e9319..280b182 100644
--- a/source-jdbc/pom.xml
+++ b/source-jdbc/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml
index cf6ef35..7609cb4 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/storage-hbase/pom.xml b/storage-hbase/pom.xml
index 4a67da5..5a7360c 100644
--- a/storage-hbase/pom.xml
+++ b/storage-hbase/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <properties>
diff --git a/storage-stream/pom.xml b/storage-stream/pom.xml
index e720275..c235378 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.1-SNAPSHOT</version>
+        <version>3.1.1</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 d7a1eae..403e6d2 100644
--- a/stream-coordinator/pom.xml
+++ b/stream-coordinator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1</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 e31b7fa..1095a7b 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.1-SNAPSHOT</version>
+        <version>3.1.1</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 d89de1d..e24de44 100644
--- a/stream-receiver/pom.xml
+++ b/stream-receiver/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1</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 f123793..d30fa13 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.1-SNAPSHOT</version>
+        <version>3.1.1</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 e804a02..683f857 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <dependencies>
diff --git a/tool-assembly/pom.xml b/tool-assembly/pom.xml
index 9c1c604..c3402e0 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <properties>
diff --git a/tool/pom.xml b/tool/pom.xml
index 98d55c3..518fbc7 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.1-SNAPSHOT</version>
+        <version>3.1.1</version>
     </parent>
 
     <properties>