You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2017/02/06 10:40:23 UTC

[1/2] kylin git commit: minor update

Repository: kylin
Updated Branches:
  refs/heads/dep-clean b75223197 -> b88e5586b


minor update


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/94b60d27
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/94b60d27
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/94b60d27

Branch: refs/heads/dep-clean
Commit: 94b60d27ef4a823e1b6c6dcffc9d4aa620e1da63
Parents: b752231
Author: Billy Liu <bi...@apache.org>
Authored: Mon Feb 6 14:35:19 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Mon Feb 6 14:35:19 2017 +0800

----------------------------------------------------------------------
 jdbc/pom.xml         |  2 +-
 source-kafka/pom.xml | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/94b60d27/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index e22a180..34bdc8a 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -70,8 +70,8 @@
                             <artifactSet>
                                 <excludes>
                                     <exclude>com.google.protobuf:*</exclude>
-                                    <exclude>commons-codec:*</exclude>
                                     <exclude>commons-logging:*</exclude>
+                                    <exclude>org.slf4j:jul-to-slf4j</exclude>
                                 </excludes>
                             </artifactSet>
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/94b60d27/source-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml
index b8fdf46..da5e033 100644
--- a/source-kafka/pom.xml
+++ b/source-kafka/pom.xml
@@ -35,17 +35,11 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.kylin</groupId>
-            <artifactId>kylin-engine-mr</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.kylin</groupId>
             <artifactId>kylin-core-common</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
+            <groupId>org.apache.kylin</groupId>
+            <artifactId>kylin-engine-mr</artifactId>
         </dependency>
 
         <!-- Provided -->
@@ -78,9 +72,5 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-
-
-
     </dependencies>
-
 </project>
\ No newline at end of file


[2/2] kylin git commit: update kyro-shaded as provided

Posted by bi...@apache.org.
update kyro-shaded as provided


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b88e5586
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b88e5586
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b88e5586

Branch: refs/heads/dep-clean
Commit: b88e5586b34117d45d42ba46d61b8bdee4760e3e
Parents: 94b60d2
Author: Billy Liu <bi...@apache.org>
Authored: Mon Feb 6 18:40:13 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Mon Feb 6 18:40:13 2017 +0800

----------------------------------------------------------------------
 core-cube/pom.xml | 8 ++++----
 pom.xml           | 5 +++++
 server/pom.xml    | 4 ++++
 3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/b88e5586/core-cube/pom.xml
----------------------------------------------------------------------
diff --git a/core-cube/pom.xml b/core-cube/pom.xml
index 5bcc112..fe80783 100644
--- a/core-cube/pom.xml
+++ b/core-cube/pom.xml
@@ -48,10 +48,6 @@
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>kryo-shaded</artifactId>
-        </dependency>
 
         <!-- Provided -->
         <dependency>
@@ -70,6 +66,10 @@
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.esotericsoftware</groupId>
+            <artifactId>kryo-shaded</artifactId>
+        </dependency>
 
         <!-- Env & Test -->
         <dependency>

http://git-wip-us.apache.org/repos/asf/kylin/blob/b88e5586/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d8e552..c717fea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -550,26 +550,31 @@
                 <groupId>org.apache.spark</groupId>
                 <artifactId>spark-core_2.10</artifactId>
                 <version>${spark.version}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.spark</groupId>
                 <artifactId>spark-sql_2.10</artifactId>
                 <version>${spark.version}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.spark</groupId>
                 <artifactId>spark-hive_2.10</artifactId>
                 <version>${spark.version}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>com.esotericsoftware</groupId>
                 <artifactId>kryo-shaded</artifactId>
                 <version>${kryo.version}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.reflections</groupId>
                 <artifactId>reflections</artifactId>
                 <version>${reflections.version}</version>
+                <scope>provided</scope>
             </dependency>
             <!-- Kafka dependency -->
             <dependency>

http://git-wip-us.apache.org/repos/asf/kylin/blob/b88e5586/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 454ed6b..3c96e60 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -233,6 +233,10 @@
                     <artifactId>jetty-all</artifactId>
                     <groupId>org.eclipse.jetty.aggregate</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>calcite-core</artifactId>
+                    <groupId>org.apache.calcite</groupId>
+                </exclusion>
             </exclusions>
         </dependency>