accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From afu...@apache.org
Subject svn commit: r1213425 - in /incubator/accumulo/branches/1.4: ./ pom.xml
Date Mon, 12 Dec 2011 20:33:21 GMT
Author: afuchs
Date: Mon Dec 12 20:33:21 2011
New Revision: 1213425

URL: http://svn.apache.org/viewvc?rev=1213425&view=rev
Log:
ACCUMULO-86 merge libthrift inclusion fix from 1.3.5rc via 1.3

Modified:
    incubator/accumulo/branches/1.4/   (props changed)
    incubator/accumulo/branches/1.4/pom.xml

Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 12 20:33:21 2011
@@ -1,3 +1,4 @@
-/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.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:1205476
 /incubator/accumulo/trunk:1205476,1205570,1208726

Modified: incubator/accumulo/branches/1.4/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/pom.xml?rev=1213425&r1=1213424&r2=1213425&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/pom.xml (original)
+++ incubator/accumulo/branches/1.4/pom.xml Mon Dec 12 20:33:21 2011
@@ -113,7 +113,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>



Mime
View raw message