You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by jn...@apache.org on 2015/04/22 08:10:14 UTC
[11/13] drill git commit: DRILL-1384: Part 6 - Change dependency from
optiq to Apache calcite. Use calcite version 1.1.0-drill-r1.
DRILL-1384: Part 6 - Change dependency from optiq to Apache calcite. Use calcite version 1.1.0-drill-r1.
Change dependency from optiq to calcite.
pom file change for jdbc/jdbc-all module. Use optiq-avertica library for drill's jdbc.
Exclude commons-loggings from calcite dependency.
Exclude jcl-over-slf4j in jdbc-all proGuard plugin.
Use calcite version 1.1.0-drill-r1.
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/e8f60b2e
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/e8f60b2e
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/e8f60b2e
Branch: refs/heads/master
Commit: e8f60b2e5de6142b74bb61b705dd48947316c01e
Parents: b413ea7
Author: Jinfeng Ni <jn...@maprtech.com>
Authored: Mon Jan 5 13:39:37 2015 -0800
Committer: Jinfeng Ni <jn...@apache.org>
Committed: Tue Apr 21 16:30:36 2015 -0700
----------------------------------------------------------------------
common/pom.xml | 4 ++--
contrib/storage-hive/core/pom.xml | 4 ++--
exec/java-exec/pom.xml | 10 +++++-----
exec/jdbc-all/pom.xml | 9 ++++++++-
exec/jdbc/pom.xml | 3 ++-
pom.xml | 12 ++++++++----
6 files changed, 27 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/e8f60b2e/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 525b533..2ca629b 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -43,8 +43,8 @@
</dependency>
<dependency>
- <groupId>net.hydromatic</groupId>
- <artifactId>optiq-core</artifactId>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/drill/blob/e8f60b2e/contrib/storage-hive/core/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml
index 9bd6293..8239b8b 100644
--- a/contrib/storage-hive/core/pom.xml
+++ b/contrib/storage-hive/core/pom.xml
@@ -53,8 +53,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.hydromatic</groupId>
- <artifactId>optiq-core</artifactId>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.drill</groupId>
http://git-wip-us.apache.org/repos/asf/drill/blob/e8f60b2e/exec/java-exec/pom.xml
----------------------------------------------------------------------
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 64a2079..17f5e6e 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -129,8 +129,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.hydromatic</groupId>
- <artifactId>optiq-core</artifactId>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-core</artifactId>
</dependency>
<dependency>
<groupId>net.sf.jpam</groupId>
@@ -509,7 +509,7 @@
</executions>
</plugin>
<plugin>
- <!-- Extract parser grammar template from optiq-core.jar and put
+ <!-- Extract parser grammar template from calcite-core.jar and put
it under ${project.build.directory} where all freemarker templates are. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -524,8 +524,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>net.hydromatic</groupId>
- <artifactId>optiq-core</artifactId>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-core</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/</outputDirectory>
http://git-wip-us.apache.org/repos/asf/drill/blob/e8f60b2e/exec/jdbc-all/pom.xml
----------------------------------------------------------------------
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index b369aed..d41f314 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -30,7 +30,8 @@
<dependencies>
<dependency>
<groupId>net.hydromatic</groupId>
- <artifactId>optiq-core</artifactId>
+ <artifactId>optiq-avatica</artifactId>
+ <version>0.9-drill-r20</version>
</dependency>
<dependency>
<groupId>org.apache.drill.exec</groupId>
@@ -234,6 +235,12 @@
<!-- do not mess with enums, Java doesn't like it -->
<option>-keep enum ** { *; }</option>
</options>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
<libs>
<lib>${java.home}/lib/rt.jar</lib>
<lib>${java.home}/lib/jsse.jar</lib>
http://git-wip-us.apache.org/repos/asf/drill/blob/e8f60b2e/exec/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml
index b4ec758..ade3869 100644
--- a/exec/jdbc/pom.xml
+++ b/exec/jdbc/pom.xml
@@ -23,7 +23,8 @@
<dependencies>
<dependency>
<groupId>net.hydromatic</groupId>
- <artifactId>optiq-core</artifactId>
+ <artifactId>optiq-avatica</artifactId>
+ <version>0.9-drill-r20</version>
</dependency>
<dependency>
<groupId>org.apache.drill</groupId>
http://git-wip-us.apache.org/repos/asf/drill/blob/e8f60b2e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 558646e..48d6970 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
</repository>
<repository>
- <!-- Keep until we move back to released optiq versions. -->
+ <!-- Keep until we move back to released calcite versions. -->
<id>mapr-drill-optiq-snapshots</id>
<name>MapR Drill Optiq Snapshots</name>
<url>http://repository.mapr.com/nexus/content/repositories/drill-optiq/</url>
@@ -1036,14 +1036,18 @@
</dependency>
<dependency>
- <groupId>net.hydromatic</groupId>
- <artifactId>optiq-core</artifactId>
- <version>0.9-drill-r21.1</version>
+ <groupId>org.apache.calcite</groupId>
+ <artifactId>calcite-core</artifactId>
+ <version>1.1.0-drill-r1</version>
<exclusions>
<exclusion>
<groupId>org.jgrapht</groupId>
<artifactId>jgrapht-jdk1.5</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>