You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ni...@apache.org on 2019/05/10 09:26:38 UTC
[kylin] branch 2.6.x updated: KYLIN-3965 JDBC fix.
This is an automated email from the ASF dual-hosted git repository.
nic pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new fd7ca25 KYLIN-3965 JDBC fix.
fd7ca25 is described below
commit fd7ca25f869419034f3cd52381db71bebaaf9153
Author: alexandr.sidorchuk <al...@apm-consult.com>
AuthorDate: Mon Apr 22 17:24:09 2019 +0300
KYLIN-3965 JDBC fix.
- Driver manager compability.
- Add guava to uber-jar for standalone usage.
---
jdbc/pom.xml | 11 ++++++++++-
jdbc/src/main/resources/META-INF/services/java.sql.Driver | 1 +
pom.xml | 4 +++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index d3236fd..e8d0ca1 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -47,11 +47,16 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@@ -102,6 +107,10 @@
<pattern>org.apache.commons</pattern>
<shadedPattern>${shadeBase}.org.apache.commons</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>com.google.common</pattern>
+ <shadedPattern>${shadeBase}.com.google.common</shadedPattern>
+ </relocation>
</relocations>
<filters>
<filter>
diff --git a/jdbc/src/main/resources/META-INF/services/java.sql.Driver b/jdbc/src/main/resources/META-INF/services/java.sql.Driver
new file mode 100644
index 0000000..e306845
--- /dev/null
+++ b/jdbc/src/main/resources/META-INF/services/java.sql.Driver
@@ -0,0 +1 @@
+org.apache.kylin.jdbc.Driver
diff --git a/pom.xml b/pom.xml
index e8ec338..42a5dce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -505,7 +505,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
@@ -1731,6 +1730,9 @@
<exclude>jdbc/kylin_jdbc.log*</exclude>
<exclude>server/logs/**</exclude>
+ <!-- jdbc service -->
+ <exclude>**/java.sql.Driver</exclude>
+
<!--ODBC sub project is a VS project, exclude related files -->
<exclude>**/*.sln</exclude>
<exclude>**/*.vcxproj</exclude>