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 2018/09/13 14:08:14 UTC

[kylin] branch master updated (375acde -> 501a804)

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

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


    from 375acde  KYLIN-3525 Reserve intermediate flat table data if kylin.source.hive.keep-flat-table set to true
     new d9972ee  KYLIN-3513 add plugin version to pom.xml KYLIN-3513 disable javadoc check KYLIN-3513 use SHA-256 algorithm
     new 0c1ef1d  minor, less test rows in RocksDBLookupTableCacheTest
     new 501a804  KYLIN-3513 bump main version to 2.6.0

The 3 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 +-
 atopcalcite/pom.xml                                |  2 +-
 core-common/pom.xml                                | 31 +---------------------
 .../java/org/apache/kylin/common/KylinVersion.java |  2 +-
 core-cube/pom.xml                                  |  2 +-
 core-dictionary/pom.xml                            |  2 +-
 .../lookup/cache/RocksDBLookupTableCacheTest.java  |  2 +-
 core-job/pom.xml                                   |  2 +-
 core-metadata/pom.xml                              |  2 +-
 core-metrics/pom.xml                               |  2 +-
 core-storage/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                                            | 18 ++++++++++---
 query/pom.xml                                      |  2 +-
 server-base/pom.xml                                |  2 +-
 server/pom.xml                                     |  2 +-
 source-hive/pom.xml                                |  6 +----
 source-kafka/pom.xml                               |  2 +-
 storage-hbase/pom.xml                              |  2 +-
 tomcat-ext/pom.xml                                 |  2 +-
 tool-assembly/pom.xml                              |  2 +-
 tool/pom.xml                                       |  2 +-
 27 files changed, 40 insertions(+), 63 deletions(-)


[kylin] 01/03: KYLIN-3513 add plugin version to pom.xml KYLIN-3513 disable javadoc check KYLIN-3513 use SHA-256 algorithm

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

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

commit d9972eef5e31c0d323f13b8b53a9842bb60b75a6
Author: shaofengshi <sh...@apache.org>
AuthorDate: Wed Sep 12 16:39:15 2018 +0800

    KYLIN-3513 add plugin version to pom.xml
    KYLIN-3513 disable javadoc check
    KYLIN-3513 use SHA-256 algorithm
---
 core-common/pom.xml | 29 -----------------------------
 pom.xml             | 16 +++++++++++++---
 source-hive/pom.xml |  4 ----
 3 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/core-common/pom.xml b/core-common/pom.xml
index 2f1c8e2..94a3e76 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -102,33 +102,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>mysql</groupId>
-                                    <artifactId>mysql-connector-java</artifactId>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.basedir}/../../build/ext</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 5324a65..83cc141 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1212,6 +1212,11 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>net.alchim31.maven</groupId>
+        <artifactId>scala-maven-plugin</artifactId>
+        <version>3.4.1</version>
+      </plugin>
     </plugins>
   </build>
 
@@ -1324,7 +1329,13 @@
               </execution>
             </executions>
           </plugin>
-
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <excludePackageNames>org.apache.kylin.*</excludePackageNames>
+            </configuration>
+          </plugin>
           <plugin>
             <groupId>de.thetaphi</groupId>
             <artifactId>forbiddenapis</artifactId>
@@ -1723,8 +1734,7 @@
             </executions>
             <configuration>
               <algorithms>
-                <algorithm>MD5</algorithm>
-                <algorithm>SHA-1</algorithm>
+                <algorithm>SHA-256</algorithm>
               </algorithms>
               <failOnError>false</failOnError>
             </configuration>
diff --git a/source-hive/pom.xml b/source-hive/pom.xml
index 4c7e937..a766e07 100644
--- a/source-hive/pom.xml
+++ b/source-hive/pom.xml
@@ -105,10 +105,6 @@
             <groupId>org.apache.kylin</groupId>
             <artifactId>kylin-engine-spark</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.kylin</groupId>
-            <artifactId>kylin-engine-spark</artifactId>
-        </dependency>
     </dependencies>
 
 </project>


[kylin] 02/03: minor, less test rows in RocksDBLookupTableCacheTest

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

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

commit 0c1ef1d4f94bcadf21be1971532ede788045e984
Author: shaofengshi <sh...@apache.org>
AuthorDate: Thu Sep 13 21:58:15 2018 +0800

    minor, less test rows in RocksDBLookupTableCacheTest
---
 .../org/apache/kylin/dict/lookup/cache/RocksDBLookupTableCacheTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-dictionary/src/test/java/org/apache/kylin/dict/lookup/cache/RocksDBLookupTableCacheTest.java b/core-dictionary/src/test/java/org/apache/kylin/dict/lookup/cache/RocksDBLookupTableCacheTest.java
index 747fe23..eb66955 100644
--- a/core-dictionary/src/test/java/org/apache/kylin/dict/lookup/cache/RocksDBLookupTableCacheTest.java
+++ b/core-dictionary/src/test/java/org/apache/kylin/dict/lookup/cache/RocksDBLookupTableCacheTest.java
@@ -82,7 +82,7 @@ public class RocksDBLookupTableCacheTest extends LocalFileMetadataTestCase {
     @Test
     public void testBuildTableCache() throws Exception {
         String snapshotID = RandomUtil.randomUUID().toString();
-        ExtTableSnapshotInfo snapshotInfo = buildSnapshotCache(snapshotID, 100000);
+        ExtTableSnapshotInfo snapshotInfo = buildSnapshotCache(snapshotID, 10000);
         assertEquals(CacheState.AVAILABLE, RocksDBLookupTableCache.getInstance(kylinConfig).getCacheState(snapshotInfo));
     }
 


[kylin] 03/03: KYLIN-3513 bump main version to 2.6.0

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

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

commit 501a8049735608705c075ade4e305317ed19ee41
Author: shaofengshi <sh...@apache.org>
AuthorDate: Thu Sep 13 22:02:04 2018 +0800

    KYLIN-3513 bump main version to 2.6.0
---
 assembly/pom.xml                                                    | 2 +-
 atopcalcite/pom.xml                                                 | 2 +-
 core-common/pom.xml                                                 | 2 +-
 core-common/src/main/java/org/apache/kylin/common/KylinVersion.java | 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 +-
 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-kafka/pom.xml                                                | 2 +-
 storage-hbase/pom.xml                                               | 2 +-
 tomcat-ext/pom.xml                                                  | 2 +-
 tool-assembly/pom.xml                                               | 2 +-
 tool/pom.xml                                                        | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index e4a739f..8a1a035 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index 4184846..58e40ef 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/core-common/pom.xml b/core-common/pom.xml
index 94a3e76..3b5f7fc 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
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
index 6fa893f..ae18d0b 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
@@ -95,7 +95,7 @@ public class KylinVersion implements Comparable {
     /**
      * Require MANUAL updating kylin version per ANY upgrading.
      */
-    private static final KylinVersion CURRENT_KYLIN_VERSION = new KylinVersion("2.5.0.20500");
+    private static final KylinVersion CURRENT_KYLIN_VERSION = new KylinVersion("2.6.0.20500");
 
     private static final KylinVersion VERSION_200 = new KylinVersion("2.0.0");
 
diff --git a/core-cube/pom.xml b/core-cube/pom.xml
index 12b34e7..12202b1a 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml
index 89b9919..56e8c6e 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/core-job/pom.xml b/core-job/pom.xml
index ae5f22c..dbce6ef 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml
index acc2371..6accda3 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/core-metrics/pom.xml b/core-metrics/pom.xml
index 37cf2c6..b503629 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/core-storage/pom.xml b/core-storage/pom.xml
index 676b7c3..bee83e1 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml
index 8161cb1..37bf577 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml
index ceb9337..9516b19 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 661356c..5b4a3b2 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml
index 8dc6532..cce1019 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/metrics-reporter-hive/pom.xml b/metrics-reporter-hive/pom.xml
index 7e60379..0af5d2c 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/metrics-reporter-kafka/pom.xml b/metrics-reporter-kafka/pom.xml
index b313e6f..2139a1b 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 83cc141..01e0442 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
   <groupId>org.apache.kylin</groupId>
   <artifactId>kylin</artifactId>
   <packaging>pom</packaging>
-  <version>2.5.0-SNAPSHOT</version>
+  <version>2.6.0-SNAPSHOT</version>
 
   <name>Apache Kylin</name>
   <url>http://kylin.apache.org</url>
diff --git a/query/pom.xml b/query/pom.xml
index 5b4d922..94999ef 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/server-base/pom.xml b/server-base/pom.xml
index baa6433..0a09b43 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/server/pom.xml b/server/pom.xml
index bf8dffc..ec0d1b8 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/source-hive/pom.xml b/source-hive/pom.xml
index a766e07..7d8eb3e 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml
index fd6199f..23b13e0 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/storage-hbase/pom.xml b/storage-hbase/pom.xml
index c1b4cea..220fc14 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/tomcat-ext/pom.xml b/tomcat-ext/pom.xml
index 06dbd49..d63d0a1 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/tool-assembly/pom.xml b/tool-assembly/pom.xml
index 274f580..fcee8fe 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>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/tool/pom.xml b/tool/pom.xml
index 086685c..958bd55 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>kylin</artifactId>
         <groupId>org.apache.kylin</groupId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <properties>