You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by af...@apache.org on 2011/12/12 21:34:12 UTC
svn commit: r1213427 - in /incubator/accumulo/trunk: ./ pom.xml
Author: afuchs
Date: Mon Dec 12 20:34:12 2011
New Revision: 1213427
URL: http://svn.apache.org/viewvc?rev=1213427&view=rev
Log:
ACCUMULO-86 merge libthrift inclusion fix from 1.3.5rc via 1.3 via 1.4
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/pom.xml
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 12 20:34:12 2011
@@ -1,2 +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
-/incubator/accumulo/branches/1.4:1201902-1212534,1213231,1213235,1213363
+/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
+/incubator/accumulo/branches/1.3.5rc:1209938
+/incubator/accumulo/branches/1.4:1201902-1212534,1213231,1213235,1213363,1213425
Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1213427&r1=1213426&r2=1213427&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Mon Dec 12 20:34:12 2011
@@ -109,7 +109,6 @@
<outputDirectory>../../lib</outputDirectory>
<!-- just grab the non-provided runtime dependencies -->
<includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api</includeArtifactIds>
- <excludeGroupIds>org.apache.accumulo</excludeGroupIds>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>