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:31:40 UTC

svn commit: r1213424 - in /incubator/accumulo/branches/1.3: ./ pom.xml

Author: afuchs
Date: Mon Dec 12 20:31:40 2011
New Revision: 1213424

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

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

Propchange: incubator/accumulo/branches/1.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 12 20:31:40 2011
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3:1209653
-/incubator/accumulo/branches/1.3.5rc:1209653
+/incubator/accumulo/branches/1.3.5rc:1209653,1209938
 /incubator/accumulo/branches/1.4:1209531

Modified: incubator/accumulo/branches/1.3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/pom.xml?rev=1213424&r1=1213423&r2=1213424&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/pom.xml (original)
+++ incubator/accumulo/branches/1.3/pom.xml Mon Dec 12 20:31:40 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>