You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2011/12/02 19:56:19 UTC
svn commit: r1209636 - in /incubator/accumulo/branches/1.3.5rc: ./ pom.xml
src/assemble/build.sh
Author: ecn
Date: Fri Dec 2 18:56:19 2011
New Revision: 1209636
URL: http://svn.apache.org/viewvc?rev=1209636&view=rev
Log:
ACCUMULO-205: merge to release candidate branch, set the expected number of rat check fails
Modified:
incubator/accumulo/branches/1.3.5rc/ (props changed)
incubator/accumulo/branches/1.3.5rc/pom.xml
incubator/accumulo/branches/1.3.5rc/src/assemble/build.sh
Propchange: incubator/accumulo/branches/1.3.5rc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 2 18:56:19 2011
@@ -1 +1 @@
-/incubator/accumulo/branches/1.3:1208023,1208031,1209526,1209532,1209539,1209541
+/incubator/accumulo/branches/1.3:1208023,1208031,1209526,1209532,1209539,1209541,1209587
Modified: incubator/accumulo/branches/1.3.5rc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3.5rc/pom.xml?rev=1209636&r1=1209635&r2=1209636&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3.5rc/pom.xml (original)
+++ incubator/accumulo/branches/1.3.5rc/pom.xml Fri Dec 2 18:56:19 2011
@@ -34,6 +34,18 @@
</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>
+ </resources>
<defaultGoal>package</defaultGoal>
<plugins>
<plugin>
@@ -123,6 +135,7 @@
<include>web/**</include>
<include>randomwalk/**</include>
<include>*.*</include>
+ <include>**/META-INF/*</include>
</includes>
</configuration>
</plugin>
Modified: incubator/accumulo/branches/1.3.5rc/src/assemble/build.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3.5rc/src/assemble/build.sh?rev=1209636&r1=1209635&r2=1209636&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3.5rc/src/assemble/build.sh (original)
+++ incubator/accumulo/branches/1.3.5rc/src/assemble/build.sh Fri Dec 2 18:56:19 2011
@@ -41,7 +41,7 @@ runAt() {
run mvn -U -P distclean clean
mvn rat:check
COUNT=`grep '!????' target/rat.txt | wc -l`
-EXPECTED=18
+EXPECTED=17
if [ "$COUNT" -ne $EXPECTED ]
then
fail expected $EXPECTED files missing licenses, but saw "$COUNT"