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/01/09 08:24:35 UTC

kylin git commit: fix protobuf version

Repository: kylin
Updated Branches:
  refs/heads/calcite-11 3a2117d4c -> a99f5d331


fix protobuf version


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

Branch: refs/heads/calcite-11
Commit: a99f5d3310dcaed5523549bfe3fd9e0a9b23969e
Parents: 3a2117d
Author: Billy Liu <bi...@apache.org>
Authored: Mon Jan 9 16:24:25 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Mon Jan 9 16:24:25 2017 +0800

----------------------------------------------------------------------
 jdbc/pom.xml   | 5 +++++
 pom.xml        | 2 ++
 server/pom.xml | 6 ++++++
 3 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/a99f5d33/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 45c212a..97e73c6 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -47,6 +47,11 @@
             <artifactId>avatica</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>${avatica.protobuf.version}</version>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/kylin/blob/a99f5d33/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b358bb5..d64a058 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,8 @@
         <!-- Calcite Version -->
         <calcite.version>1.11.0</calcite.version>
         <avatica.version>1.9.0</avatica.version>
+        <!-- Since both Hive and Calcite has dependency with Avatica, but with different versions and different protocol dependencies, has to hard code the version and put the right place -->
+        <avatica.protobuf.version>3.1.0</avatica.protobuf.version>
 
         <!-- Sonar -->
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

http://git-wip-us.apache.org/repos/asf/kylin/blob/a99f5d33/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index ed96442..b40883a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -50,6 +50,12 @@
         </dependency>
 
         <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>${avatica.protobuf.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>com.thetransactioncompany</groupId>
             <artifactId>cors-filter</artifactId>
             <exclusions>