You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2011/12/06 21:33:16 UTC
svn commit: r1211094 - /incubator/accumulo/trunk/pom.xml
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>