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 2012/03/15 18:36:03 UTC
svn commit: r1301110 - in /incubator/accumulo/trunk: ./ assemble/build.sh
Author: ecn
Date: Thu Mar 15 17:36:03 2012
New Revision: 1301110
URL: http://svn.apache.org/viewvc?rev=1301110&view=rev
Log:
ACCUMULO-145 merge to trunk
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/assemble/build.sh
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 17:36:03 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
/incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1300181,1301056
+/incubator/accumulo/branches/1.4:1201902-1300181,1300277,1300713,1301056
Modified: incubator/accumulo/trunk/assemble/build.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/assemble/build.sh?rev=1301110&r1=1301109&r2=1301110&view=diff
==============================================================================
--- incubator/accumulo/trunk/assemble/build.sh (original)
+++ incubator/accumulo/trunk/assemble/build.sh Thu Mar 15 17:36:03 2012
@@ -41,12 +41,13 @@ runAt() {
run mvn -U -P distclean clean
mvn rat:check
COUNT=`grep '!????' target/rat.txt | wc -l`
-EXPECTED=19
+EXPECTED=56
if [ "$COUNT" -ne $EXPECTED ]
then
fail expected $EXPECTED files missing licenses, but saw "$COUNT"
fi
+#need to run mvn package twice to properly build docs/config.html
+run mvn package
run mvn package javadoc:aggregate javadoc:jar source:jar
runAt ./src/server/src/main/c++ make
-run mvn package source:jar assembly:single
-test -x /usr/bin/rpmbuild && run mvn -N rpm:rpm
+run mvn assembly:single -N