Return-Path: 
 <accumulo-commits-return-597-apmail-incubator-accumulo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E63BE9A6A
	for <apmail-incubator-accumulo-commits-archive@minotaur.apache.org>;
 Tue,  6 Dec 2011 20:33:40 +0000 (UTC)
Received: (qmail 79191 invoked by uid 500); 6 Dec 2011 20:33:40 -0000
Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org
Received: (qmail 79172 invoked by uid 500); 6 Dec 2011 20:33:40 -0000
Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:accumulo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:accumulo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:accumulo-commits@incubator.apache.org>
List-Id: <accumulo-commits.incubator.apache.org>
Reply-To: accumulo-dev@incubator.apache.org
Delivered-To: mailing list accumulo-commits@incubator.apache.org
Received: (qmail 79165 invoked by uid 99); 6 Dec 2011 20:33:40 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Dec 2011 20:33:40 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Dec 2011 20:33:38 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9281F238897D;
	Tue,  6 Dec 2011 20:33:16 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1211094 - /incubator/accumulo/trunk/pom.xml
Date: Tue, 06 Dec 2011 20:33:16 -0000
To: accumulo-commits@incubator.apache.org
From: vines@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111206203316.9281F238897D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: vines
Date: Tue Dec  6 20:33:16 2011
New Revision: 1211094

URL: http://svn.apache.org/viewvc?rev=1211094&view=rev
Log:
ACCUMULO-86 - The merge of the META-INF files didn't quite work in trunk... or I broke it with my last commit

Modified:
    incubator/accumulo/trunk/pom.xml

Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1211094&r1=1211093&r2=1211094&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Tue Dec  6 20:33:16 2011
@@ -29,6 +29,22 @@
   </modules>
 
   <build>
+    <resources>
+      <resource>
+        <directory>${basedir}/../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>CHANGES</include>
+          <include>LICENSE</include>
+          <include>DISCLAIMER</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+      </resource>
+    </resources>
+    
     <defaultGoal>package</defaultGoal>
     <plugins>
       <plugin>
@@ -118,6 +134,7 @@
             <include>web/**</include>
             <include>randomwalk/**</include>
             <include>*.*</include>
+            <include>**/META-INF/*</include>      
           </includes>
         </configuration>
       </plugin>