Repository: drill Updated Branches: refs/heads/master c8a78409d -> 8a411b504
DRILL-4485 - MapR profile - switch to MapR 5.1.0, and improve compatibility with maprfs storage format and MapR DB storage plugin. This closes #417 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/8a411b50 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/8a411b50 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/8a411b50 Branch: refs/heads/master Commit: 8a411b504105174414cbff990182e0841815c7f9 Parents: c8a7840 Author: Patrick Wong <Patrick Wong> Authored: Mon Mar 7 18:22:08 2016 -0800 Committer: Parth Chandra <[email protected]> Committed: Tue Mar 8 16:30:22 2016 -0800 ---------------------------------------------------------------------- distribution/pom.xml | 36 ++++++++++++++++++++++++++++++---- pom.xml | 49 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 72 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/8a411b50/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index f572e66..081493f 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -232,10 +232,6 @@ </dependency> <dependency> <groupId>com.mapr.fs</groupId> - <artifactId>libprotodefs</artifactId> - </dependency> - <dependency> - <groupId>com.mapr.fs</groupId> <artifactId>mapr-hbase</artifactId> <exclusions> <exclusion> @@ -245,11 +241,43 @@ </exclusions> </dependency> <dependency> + <groupId>com.mapr.db</groupId> + <artifactId>maprdb</artifactId> + </dependency> + <dependency> + <groupId>org.ojai</groupId> + <artifactId>ojai</artifactId> + </dependency> + <dependency> + <groupId>com.mapr.fs</groupId> + <artifactId>mapr-hbase</artifactId> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-winutils</artifactId> <version>2.7.0-mapr-1506</version> <type>zip</type> </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol</artifactId> + </dependency> </dependencies> <build> </build> http://git-wip-us.apache.org/repos/asf/drill/blob/8a411b50/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 56fd4ee..3bc3208 100644 --- a/pom.xml +++ b/pom.xml @@ -1389,10 +1389,10 @@ <properties> <alt-hadoop>mapr</alt-hadoop> <rat.excludeSubprojects>true</rat.excludeSubprojects> - <hive.version>1.2.0-mapr-1510</hive.version> - <hbase.version>0.98.9-mapr-1503-m7-4.1.0</hbase.version> - <hadoop.version>2.7.0-mapr-1506</hadoop.version> - <mapr.core.version>4.1.0-mapr</mapr.core.version> + <hive.version>1.2.0-mapr-1601</hive.version> + <hbase.version>1.1.1-mapr-1602-m7-5.1.0</hbase.version> + <hadoop.version>2.7.0-mapr-1602</hadoop.version> + <mapr.core.version>5.1.0-mapr</mapr.core.version> </properties> <dependencyManagement> <dependencies> @@ -1585,11 +1585,6 @@ </dependency> <dependency> <groupId>com.mapr.fs</groupId> - <artifactId>libprotodefs</artifactId> - <version>${mapr.core.version}</version> - </dependency> - <dependency> - <groupId>com.mapr.fs</groupId> <artifactId>mapr-hbase</artifactId> <version>${mapr.core.version}</version> <exclusions> @@ -1629,6 +1624,27 @@ <version>${mapr.core.version}</version> </dependency> <dependency> + <groupId>com.mapr.db</groupId> + <artifactId>maprdb</artifactId> + <version>${mapr.core.version}</version> + </dependency> + <dependency> + <groupId>org.ojai</groupId> + <artifactId>ojai</artifactId> + <version>1.0</version> + <exclusions> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>4.5</version> + </dependency> + <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.11.0</version> @@ -1776,6 +1792,21 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol</artifactId> + <version>${hbase.version}</version> + </dependency> </dependencies> </dependencyManagement> <repositories>
