DRILL-187 move hadoop dependency to top level pom
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/28414fe2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/28414fe2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/28414fe2 Branch: refs/heads/master Commit: 28414fe2b9a9a6a05dd65306ca62406e6b72800b Parents: 2bcf054 Author: Steven Phillips <sphill...@maprtech.com> Authored: Tue Aug 27 19:03:38 2013 -0700 Committer: Jacques Nadeau <jacq...@apache.org> Committed: Wed Aug 28 20:37:57 2013 -0700 ---------------------------------------------------------------------- sandbox/prototype/exec/java-exec/pom.xml | 52 ------------------ sandbox/prototype/exec/ref/pom.xml | 12 ----- .../drill/exec/ref/values/BaseArrayValue.java | 1 - .../drill/exec/ref/values/BaseMapValue.java | 1 - .../drill/exec/ref/values/ScalarValues.java | 1 - .../drill/exec/ref/values/SimpleMapValue.java | 1 - .../drill/exec/ref/values/ValueUtils.java | 1 - sandbox/prototype/pom.xml | 55 ++++++++++++++++++++ 8 files changed, 55 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/28414fe2/sandbox/prototype/exec/java-exec/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/java-exec/pom.xml b/sandbox/prototype/exec/java-exec/pom.xml index e7d3f16..70e4147 100644 --- a/sandbox/prototype/exec/java-exec/pom.xml +++ b/sandbox/prototype/exec/java-exec/pom.xml @@ -116,58 +116,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> - <version>1.2.1</version> - <exclusions> - <exclusion> - <artifactId>jets3t</artifactId> - <groupId>net.java.dev.jets3t</groupId> - </exclusion> - <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</groupId> - </exclusion> - - <exclusion> - <artifactId>mockito-all</artifactId> - <groupId>org.mockito</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging-api</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>slf4j-log4j12</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api-2.5</artifactId> - <groupId>org.mortbay.jetty</groupId> - </exclusion> - <exclusion> - <artifactId>jasper-runtime</artifactId> - <groupId>tomcat</groupId> - </exclusion> - <exclusion> - <artifactId>jasper-compiler</artifactId> - <groupId>tomcat</groupId> - </exclusion> - <exclusion> - <artifactId>jetty</artifactId> - <groupId>org.mortbay.jetty</groupId> - </exclusion> - <exclusion> - <artifactId>jersey-server</artifactId> - <groupId>com.sun.jersey</groupId> - </exclusion> - <exclusion> - <artifactId>core</artifactId> - <groupId>org.eclipse.jdt</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.carrotsearch</groupId> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/28414fe2/sandbox/prototype/exec/ref/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/ref/pom.xml b/sandbox/prototype/exec/ref/pom.xml index 956f095..4a81285 100644 --- a/sandbox/prototype/exec/ref/pom.xml +++ b/sandbox/prototype/exec/ref/pom.xml @@ -24,20 +24,8 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> - <version>1.1.1</version> - <exclusions> - <exclusion> - <artifactId>jets3t</artifactId> - <groupId>net.java.dev.jets3t</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - </exclusions> </dependency> - <dependency> <groupId>com.carrotsearch</groupId> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/28414fe2/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/BaseArrayValue.java ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/BaseArrayValue.java b/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/BaseArrayValue.java index 5831d37..be808a3 100644 --- a/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/BaseArrayValue.java +++ b/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/BaseArrayValue.java @@ -21,7 +21,6 @@ import org.apache.drill.common.expression.PathSegment; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; -import org.apache.tools.ant.types.DataType; public abstract class BaseArrayValue extends BaseDataValue implements ContainerValue{ http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/28414fe2/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/BaseMapValue.java ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/BaseMapValue.java b/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/BaseMapValue.java index 87bd344..4b7e192 100644 --- a/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/BaseMapValue.java +++ b/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/BaseMapValue.java @@ -25,7 +25,6 @@ import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.ref.exceptions.RecordException; -import org.apache.tools.ant.types.DataType; public abstract class BaseMapValue extends BaseDataValue implements ContainerValue, Iterable<Map.Entry<CharSequence, DataValue>> { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/28414fe2/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/ScalarValues.java ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/ScalarValues.java b/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/ScalarValues.java index 201c8fc..ba2e85a 100644 --- a/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/ScalarValues.java +++ b/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/ScalarValues.java @@ -29,7 +29,6 @@ import org.apache.drill.common.types.Types; import org.apache.drill.exec.ref.eval.EvaluatorTypes.BasicEvaluator; import org.apache.drill.exec.ref.rops.DataWriter; import org.apache.hadoop.io.BytesWritable; -import org.apache.tools.ant.types.DataType; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/28414fe2/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/SimpleMapValue.java ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/SimpleMapValue.java b/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/SimpleMapValue.java index ab231ff..ec11225 100644 --- a/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/SimpleMapValue.java +++ b/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/SimpleMapValue.java @@ -27,7 +27,6 @@ import java.util.Map.Entry; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.exec.ref.exceptions.RecordException; import org.apache.drill.exec.ref.rops.DataWriter; -import org.apache.tools.ant.types.DataType; public class SimpleMapValue extends BaseMapValue{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SimpleMapValue.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/28414fe2/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/ValueUtils.java ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/ValueUtils.java b/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/ValueUtils.java index dff8b11..11617a4 100644 --- a/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/ValueUtils.java +++ b/sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/values/ValueUtils.java @@ -23,7 +23,6 @@ import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.ref.exceptions.RecordException; -import org.apache.tools.ant.types.DataType; public class ValueUtils { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ValueUtils.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/28414fe2/sandbox/prototype/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/pom.xml b/sandbox/prototype/pom.xml index dcc49a5..98b2232 100644 --- a/sandbox/prototype/pom.xml +++ b/sandbox/prototype/pom.xml @@ -292,7 +292,62 @@ <!-- Managed Dependencies --> <dependencyManagement> <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>1.2.1</version> + <exclusions> + <exclusion> + <artifactId>jets3t</artifactId> + <groupId>net.java.dev.jets3t</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> + <artifactId>mockito-all</artifactId> + <groupId>org.mockito</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging-api</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api-2.5</artifactId> + <groupId>org.mortbay.jetty</groupId> + </exclusion> + <exclusion> + <artifactId>jasper-runtime</artifactId> + <groupId>tomcat</groupId> + </exclusion> + <exclusion> + <artifactId>jasper-compiler</artifactId> + <groupId>tomcat</groupId> + </exclusion> + <exclusion> + <artifactId>jetty</artifactId> + <groupId>org.mortbay.jetty</groupId> + </exclusion> + <exclusion> + <artifactId>jersey-server</artifactId> + <groupId>com.sun.jersey</groupId> + </exclusion> + <exclusion> + <artifactId>core</artifactId> + <groupId>org.eclipse.jdt</groupId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> <modules>
