You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@crunch.apache.org by jw...@apache.org on 2012/08/22 08:26:48 UTC

[1/9] git commit: Exclude unnecessary avro dependencies and do a slight cleanup of the pom dependencies in the non-core subprojects

Updated Branches:
  refs/heads/master 457a067b6 -> e72f9fde7


Exclude unnecessary avro dependencies and do a slight cleanup of the pom dependencies in the non-core subprojects


Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/e72f9fde
Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/e72f9fde
Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/e72f9fde

Branch: refs/heads/master
Commit: e72f9fde7bf183bc2762073ce9e7321662b912f2
Parents: 9d8b679
Author: Josh Wills <jw...@cloudera.com>
Authored: Tue Aug 21 21:54:16 2012 -0700
Committer: Josh Wills <jw...@cloudera.com>
Committed: Tue Aug 21 21:54:16 2012 -0700

----------------------------------------------------------------------
 crunch-examples/pom.xml |    8 +++++++-
 crunch-hbase/pom.xml    |    7 +++++++
 crunch-test/pom.xml     |    2 ++
 pom.xml                 |   33 ++++++++++++++++++++++++++++++++-
 4 files changed, 48 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e72f9fde/crunch-examples/pom.xml
----------------------------------------------------------------------
diff --git a/crunch-examples/pom.xml b/crunch-examples/pom.xml
index c07207a..10e828e 100644
--- a/crunch-examples/pom.xml
+++ b/crunch-examples/pom.xml
@@ -35,13 +35,19 @@ under the License.
       <artifactId>guava</artifactId>
     </dependency>
 
-   <dependency>
+    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.crunch</groupId>
       <artifactId>crunch</artifactId>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e72f9fde/crunch-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/crunch-hbase/pom.xml b/crunch-hbase/pom.xml
index d97b457..1a57b01 100644
--- a/crunch-hbase/pom.xml
+++ b/crunch-hbase/pom.xml
@@ -43,6 +43,7 @@ under the License.
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -63,6 +64,12 @@ under the License.
     </dependency>
 
     <dependency>
+     <groupId>org.apache.hadoop</groupId>
+     <artifactId>hadoop-minicluster</artifactId>
+     <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase</artifactId>
       <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e72f9fde/crunch-test/pom.xml
----------------------------------------------------------------------
diff --git a/crunch-test/pom.xml b/crunch-test/pom.xml
index a1e3899..629533f 100644
--- a/crunch-test/pom.xml
+++ b/crunch-test/pom.xml
@@ -41,11 +41,13 @@ under the License.
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
      <groupId>org.apache.hadoop</groupId>
      <artifactId>hadoop-minicluster</artifactId>
+     <scope>provided</scope>
     </dependency>
 
     <!-- Required by LocalJobRunner -->

http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/e72f9fde/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1c5b4c7..3982dbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,12 +146,43 @@ under the License.
         <groupId>org.apache.avro</groupId>
         <artifactId>avro</artifactId>
         <version>${avro.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.jboss.netty</groupId>
+            <artifactId>netty</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.thoughtworks.paranamer</groupId>
+            <artifactId>paranamer-ant</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
-
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-mapred</artifactId>
         <version>${avro.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro-ipc</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>