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/10 07:58:36 UTC
kylin git commit: shade protobuf
Repository: kylin
Updated Branches:
refs/heads/calcite-11 bbb0ed855 -> 2b72f7433
shade protobuf
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2b72f743
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2b72f743
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2b72f743
Branch: refs/heads/calcite-11
Commit: 2b72f7433ba4e811166b3110cb4d76bf5111b9fe
Parents: bbb0ed8
Author: Billy Liu <bi...@apache.org>
Authored: Tue Jan 10 15:58:23 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Tue Jan 10 15:58:23 2017 +0800
----------------------------------------------------------------------
jdbc/pom.xml | 4 ++++
kylin-it/pom.xml | 2 ++
.../src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java | 1 +
3 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/2b72f743/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 97e73c6..0a70949 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -96,6 +96,10 @@
<pattern>org.apache.commons</pattern>
<shadedPattern>${shadeBase}.org.apache.commons</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>com.google.protobuf</pattern>
+ <shadedPattern>${shadeBase}.com.google.protobuf</shadedPattern>
+ </relocation>
</relocations>
<filters>
<filter>
http://git-wip-us.apache.org/repos/asf/kylin/blob/2b72f743/kylin-it/pom.xml
----------------------------------------------------------------------
diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml
index 9bc1885..94cdb7e 100644
--- a/kylin-it/pom.xml
+++ b/kylin-it/pom.xml
@@ -55,10 +55,12 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-source-hive</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-jdbc</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin-tool</artifactId>
http://git-wip-us.apache.org/repos/asf/kylin/blob/2b72f743/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
----------------------------------------------------------------------
diff --git a/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java b/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
index df6eb2f..05f615f 100644
--- a/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
+++ b/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java
@@ -21,6 +21,7 @@ package org.apache.kylin.jdbc;
import java.io.File;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
+import java.sql.Driver;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;