Repository: drill Updated Branches: refs/heads/master 9c00027dd -> c047f04b5
DRILL-4493 - Fixed issues in various POMs with MapR profile This closes #421 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/c047f04b Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/c047f04b Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/c047f04b Branch: refs/heads/master Commit: c047f04b507faecc6bc65f15e2618162a23de09d Parents: 9c00027 Author: Aditya Kishore <a...@apache.org> Authored: Wed Mar 9 00:38:33 2016 -0800 Committer: Parth Chandra <par...@apache.org> Committed: Wed Mar 9 10:33:45 2016 -0800 ---------------------------------------------------------------------- distribution/pom.xml | 12 ------- exec/java-exec/pom.xml | 14 -------- exec/jdbc/pom.xml | 1 + pom.xml | 81 ++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 73 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/c047f04b/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 081493f..40a7e0a 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -245,18 +245,6 @@ <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> http://git-wip-us.apache.org/repos/asf/drill/blob/c047f04b/exec/java-exec/pom.xml ---------------------------------------------------------------------- diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index 9619246..2532290 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -430,20 +430,6 @@ </activation> </profile> <profile> - <id>mapr</id> - <dependencies> - <dependency> - <groupId>com.mapr.hadoop</groupId> - <artifactId>maprfs</artifactId> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - </dependency> - </dependencies> - </profile> - <profile> <id>cdh4</id> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/drill/blob/c047f04b/exec/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml index 296aba0..6a19a12 100644 --- a/exec/jdbc/pom.xml +++ b/exec/jdbc/pom.xml @@ -134,6 +134,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> + <scope>test</scope> <exclusions> <exclusion> <artifactId>commons-logging</artifactId> http://git-wip-us.apache.org/repos/asf/drill/blob/c047f04b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3bc3208..a907ae7 100644 --- a/pom.xml +++ b/pom.xml @@ -1390,7 +1390,7 @@ <alt-hadoop>mapr</alt-hadoop> <rat.excludeSubprojects>true</rat.excludeSubprojects> <hive.version>1.2.0-mapr-1601</hive.version> - <hbase.version>1.1.1-mapr-1602-m7-5.1.0</hbase.version> + <hbase.version>0.98.12-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> @@ -1589,6 +1589,10 @@ <version>${mapr.core.version}</version> <exclusions> <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> <artifactId>slf4j-log4j12</artifactId> <groupId>org.slf4j</groupId> </exclusion> @@ -1627,6 +1631,12 @@ <groupId>com.mapr.db</groupId> <artifactId>maprdb</artifactId> <version>${mapr.core.version}</version> + <exclusions> + <exclusion> + <groupId>com.mapr</groupId> + <artifactId>mapr-java-utils</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.ojai</groupId> @@ -1745,21 +1755,48 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId> </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <version>${hbase.version}</version> + <exclusions> <exclusion> - <artifactId>asm</artifactId> - <groupId>asm</groupId> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> </exclusion> <exclusion> - <artifactId>libthrift</artifactId> - <groupId>org.apache.thrift</groupId> + <artifactId>servlet-api-2.5</artifactId> + <groupId>org.mortbay.jetty</groupId> </exclusion> <exclusion> - <artifactId>jruby-complete</artifactId> - <groupId>org.jruby</groupId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </exclusion> <exclusion> - <artifactId>hadoop-core</artifactId> - <groupId>org.apache.hadoop</groupId> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> </exclusion> </exclusions> </dependency> @@ -1796,16 +1833,42 @@ <groupId>org.apache.hbase</groupId> <artifactId>hbase-annotations</artifactId> <version>${hbase.version}</version> + <exclusions> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> <version>${hbase.version}</version> + <exclusions> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-protocol</artifactId> <version>${hbase.version}</version> + <exclusions> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> </dependency> </dependencies> </dependencyManagement>
