You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@drill.apache.org by ja...@apache.org on 2013/09/02 00:22:10 UTC
[09/18] git commit: fix jackson conflict for mapr build
fix jackson conflict for mapr build
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/5ff952b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/5ff952b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/5ff952b9
Branch: refs/heads/master
Commit: 5ff952b9ca3c645e8de12f7734892193bf2bf6c8
Parents: 35f43f5
Author: Steven Phillips <sp...@maprtech.com>
Authored: Fri Aug 30 11:53:49 2013 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Sun Sep 1 15:16:21 2013 -0700
----------------------------------------------------------------------
sandbox/prototype/pom.xml | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5ff952b9/sandbox/prototype/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/prototype/pom.xml b/sandbox/prototype/pom.xml
index 5a714df..16fea84 100644
--- a/sandbox/prototype/pom.xml
+++ b/sandbox/prototype/pom.xml
@@ -358,7 +358,28 @@
<version>1.0.3-mapr-3.0.0</version>
<exclusions>
<exclusion>
- <artifactId>jets3t</artifactId>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>mockito-all</artifactId>
+ <groupId>org.codehaus</groupId>
+ </exclusion>
+ <exclusion>
+
+ <artifactId>jets3t</artifactId>
<groupId>net.java.dev.jets3t</groupId>
</exclusion>
<exclusion>