From 72426552f40dcdfe88d747fd0ea8ab6ab8966553 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Wed, 17 Mar 2010 04:56:58 +0000
Subject: [PATCH] HBASE-2334 Slimming of Maven dependency tree - improves
 assembly build

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@924156 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt  |  5 +++++
 core/pom.xml | 46 ++++++++++++++++++++++++++++++++++++----------
 pom.xml      |  4 ----
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f1e09036991..42bab895747 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -241,6 +241,11 @@ Release 0.21.0 - Unreleased
    HBASE-2305  Client port for ZK has no default (Suraj Varma via Stack)
    HBASE-2323  filter.RegexStringComparator does not work with certain bytes
                (Benoit Sigoure via Stack)
+   HBASE-2313  Nit-pick about hbase-2279 shell fixup, if you do get with
+               non-existant column family, throws lots of exceptions
+               (Alexey Kovyrin via Stack)
+   HBASE-2334  Slimming of Maven dependency tree - improves assembly build
+               speed (Paul Smith via Stack)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/core/pom.xml b/core/pom.xml
index 7822272d5cc..c5c70db5bfd 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -164,6 +164,10 @@
           <groupId>javax.jms</groupId>
           <artifactId>jms</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.mail</groupId>
+          <artifactId>mail</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>com.sun.jmx</groupId>
           <artifactId>jmxri</artifactId>
@@ -178,6 +182,16 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapred</artifactId>
       <version>${hadoop-mapred.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>ant</groupId>
+          <artifactId>ant</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.thoughtworks.paranamer</groupId>
+          <artifactId>paranamer</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -196,6 +210,28 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
       <version>${hadoop-core.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>ant</groupId>
+          <artifactId>ant</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.thoughtworks.paranamer</groupId>
+          <artifactId>paranamer-ant</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>hsqldb</groupId>
+          <artifactId>hsqldb</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>net.sf.kosmosfs</groupId>
+          <artifactId>kfs</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>net.java.dev.jets3t</groupId>
+          <artifactId>jets3t</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -222,16 +258,6 @@
       <artifactId>commons-lang</artifactId>
       <version>${commons-lang.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
diff --git a/pom.xml b/pom.xml
index d70dd70fbfa..77732598f19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -308,10 +308,6 @@
           <descriptors>
             <descriptor>src/assembly/bin.xml</descriptor>
           </descriptors>
-          <descriptorRefs>
-            <descriptorRef>src</descriptorRef>
-            <descriptorRef>project</descriptorRef>
-          </descriptorRefs>
         </configuration>
       </plugin>
     </plugins>