kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billy...@apache.org
Subject kylin git commit: upgrade jackson and update it to compile scope
Date Sun, 05 Feb 2017 02:09:22 GMT
Repository: kylin
Updated Branches:
  refs/heads/dep-clean 778d05a75 -> b75223197


upgrade jackson and update it to compile scope


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

Branch: refs/heads/dep-clean
Commit: b75223197283427cf504a0ebddf4fe19ecafe655
Parents: 778d05a
Author: Billy Liu <billyliu@apache.org>
Authored: Sun Feb 5 10:09:07 2017 +0800
Committer: Billy Liu <billyliu@apache.org>
Committed: Sun Feb 5 10:09:07 2017 +0800

----------------------------------------------------------------------
 core-common/pom.xml     |  4 ++--
 core-cube/pom.xml       |  4 ----
 core-dictionary/pom.xml |  6 ------
 core-job/pom.xml        |  4 ----
 core-metadata/pom.xml   |  4 ----
 core-storage/pom.xml    |  4 ----
 engine-mr/pom.xml       |  5 -----
 jdbc/pom.xml            |  2 ++
 pom.xml                 | 23 +++++++++++------------
 source-kafka/pom.xml    |  4 ----
 storage-hbase/pom.xml   |  5 -----
 tool/pom.xml            |  6 ------
 12 files changed, 15 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/b7522319/core-common/pom.xml
----------------------------------------------------------------------
diff --git a/core-common/pom.xml b/core-common/pom.xml
index 316e316..95d3c29 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -34,7 +34,6 @@
 
     <dependencies>
         <!-- Basic Utilities -->
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -47,11 +46,12 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
-        <!-- Provided -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+
+        <!-- Provided -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>

http://git-wip-us.apache.org/repos/asf/kylin/blob/b7522319/core-cube/pom.xml
----------------------------------------------------------------------
diff --git a/core-cube/pom.xml b/core-cube/pom.xml
index ab8d896..5bcc112 100644
--- a/core-cube/pom.xml
+++ b/core-cube/pom.xml
@@ -63,10 +63,6 @@
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/kylin/blob/b7522319/core-dictionary/pom.xml
----------------------------------------------------------------------
diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml
index fe3910b..5d839dd 100644
--- a/core-dictionary/pom.xml
+++ b/core-dictionary/pom.xml
@@ -39,12 +39,6 @@
             <artifactId>kylin-core-metadata</artifactId>
         </dependency>
 
-        <!-- Provided -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
         <!-- Env & Test -->
         <dependency>
             <groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/kylin/blob/b7522319/core-job/pom.xml
----------------------------------------------------------------------
diff --git a/core-job/pom.xml b/core-job/pom.xml
index 5893b75..9478555 100644
--- a/core-job/pom.xml
+++ b/core-job/pom.xml
@@ -49,10 +49,6 @@
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
             <exclusions>

http://git-wip-us.apache.org/repos/asf/kylin/blob/b7522319/core-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml
index b5f6394..0832e80 100644
--- a/core-metadata/pom.xml
+++ b/core-metadata/pom.xml
@@ -53,10 +53,6 @@
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/kylin/blob/b7522319/core-storage/pom.xml
----------------------------------------------------------------------
diff --git a/core-storage/pom.xml b/core-storage/pom.xml
index e6dd7e6..8c3da5f 100644
--- a/core-storage/pom.xml
+++ b/core-storage/pom.xml
@@ -41,10 +41,6 @@
 
         <!-- Provided -->
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/kylin/blob/b7522319/engine-mr/pom.xml
----------------------------------------------------------------------
diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml
index 0c39e31..b4ee16e 100644
--- a/engine-mr/pom.xml
+++ b/engine-mr/pom.xml
@@ -111,11 +111,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/kylin/blob/b7522319/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 3b5397e..e22a180 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -70,6 +70,8 @@
                             <artifactSet>
                                 <excludes>
                                     <exclude>com.google.protobuf:*</exclude>
+                                    <exclude>commons-codec:*</exclude>
+                                    <exclude>commons-logging:*</exclude>
                                 </excludes>
                             </artifactSet>
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/b7522319/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 26d67c0..6d8e552 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,10 @@
         <kryo.version>4.0.0</kryo.version>
         <reflections.version>0.9.10</reflections.version>
 
+        <!-- Calcite Version -->
+        <calcite.version>1.11.0</calcite.version>
+        <avatica.version>1.9.0</avatica.version>
+
         <!-- Hadoop Common deps, keep compatible with hadoop2.version -->
         <zookeeper.version>3.4.6</zookeeper.version>
         <curator.version>2.7.1</curator.version>
@@ -75,8 +79,8 @@
         <commons-io.version>2.5</commons-io.version>
         <commons-math3.version>3.6.1</commons-math3.version>
 
-        <!-- Hadoop deps, keep compatible with hadoop2.version -->
-        <jackson.version>2.2.4</jackson.version>
+        <!-- Calcite deps, keep compatible with calcite.version -->
+        <jackson.version>2.6.3</jackson.version>
 
         <!-- Test Dependency versions -->
         <antlr.version>3.4</antlr.version>
@@ -114,10 +118,6 @@
         <opensaml.version>2.6.4</opensaml.version>
         <aspectj.version>1.8.9</aspectj.version>
 
-        <!-- Calcite Version -->
-        <calcite.version>1.11.0</calcite.version>
-        <avatica.version>1.9.0</avatica.version>
-
         <!-- Sonar -->
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -539,6 +539,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
 
             <!-- Spark dependency -->
             <dependency>
@@ -595,12 +600,6 @@
                 <artifactId>commons-email</artifactId>
                 <version>${commons-email.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>${jackson.version}</version>
-                <scope>provided</scope>
-            </dependency>
 
             <!-- Logging -->
             <dependency>

http://git-wip-us.apache.org/repos/asf/kylin/blob/b7522319/source-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml
index 87424ec..b8fdf46 100644
--- a/source-kafka/pom.xml
+++ b/source-kafka/pom.xml
@@ -50,10 +50,6 @@
 
         <!-- Provided -->
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka_2.10</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/kylin/blob/b7522319/storage-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/storage-hbase/pom.xml b/storage-hbase/pom.xml
index e865857..054b2e7 100644
--- a/storage-hbase/pom.xml
+++ b/storage-hbase/pom.xml
@@ -93,11 +93,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/kylin/blob/b7522319/tool/pom.xml
----------------------------------------------------------------------
diff --git a/tool/pom.xml b/tool/pom.xml
index 9479b6a..91040d4 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -54,12 +54,6 @@
             <artifactId>kylin-source-hive</artifactId>
         </dependency>
 
-        <!-- Provided -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
         <!--Env-->
         <dependency>
             <groupId>org.apache.hbase</groupId>


Mime
View raw message