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/02 16:46:36 UTC

svn commit: r1209542 - in /incubator/accumulo/branches/1.3.5rc: ./ contrib/libthrift-0.3.jar pom.xml src/core/pom.xml src/trace/pom.xml

Author: afuchs
Date: Fri Dec  2 15:46:36 2011
New Revision: 1209542

URL: http://svn.apache.org/viewvc?rev=1209542&view=rev
Log:
ACCUMULO-191

Removed:
    incubator/accumulo/branches/1.3.5rc/contrib/libthrift-0.3.jar
Modified:
    incubator/accumulo/branches/1.3.5rc/   (props changed)
    incubator/accumulo/branches/1.3.5rc/pom.xml
    incubator/accumulo/branches/1.3.5rc/src/core/pom.xml
    incubator/accumulo/branches/1.3.5rc/src/trace/pom.xml

Propchange: incubator/accumulo/branches/1.3.5rc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  2 15:46:36 2011
@@ -1 +1 @@
-/incubator/accumulo/branches/1.3:1209526,1209532
+/incubator/accumulo/branches/1.3:1208023,1209526,1209532

Modified: incubator/accumulo/branches/1.3.5rc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3.5rc/pom.xml?rev=1209542&r1=1209541&r2=1209542&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3.5rc/pom.xml (original)
+++ incubator/accumulo/branches/1.3.5rc/pom.xml Fri Dec  2 15:46:36 2011
@@ -529,11 +529,9 @@
         <version>3.2</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.thrift</groupId>
+        <groupId>org.apache.accumulo.thrift</groupId>
         <artifactId>libthrift</artifactId>
         <version>0.3</version>
-        <scope>system</scope>
-        <systemPath>${basedir}/${project.parent.relativePath}/contrib/libthrift-0.3.jar</systemPath>
       </dependency>
       <dependency>
         <groupId>jline</groupId>
@@ -591,6 +589,13 @@
     </dependency>
   </dependencies>
 
+  <repositories>
+    <repository>
+      <id>legacy-releases</id>
+      <url>http://incubator.apache.org/accumulo/mvn_repo</url>
+    </repository>
+  </repositories>
+
   <distributionManagement>
     <repository>
       <id>accumulo-releases-repo</id>

Modified: incubator/accumulo/branches/1.3.5rc/src/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3.5rc/src/core/pom.xml?rev=1209542&r1=1209541&r2=1209542&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3.5rc/src/core/pom.xml (original)
+++ incubator/accumulo/branches/1.3.5rc/src/core/pom.xml Fri Dec  2 15:46:36 2011
@@ -87,7 +87,7 @@
       <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.thrift</groupId>
+      <groupId>org.apache.accumulo.thrift</groupId>
       <artifactId>libthrift</artifactId>
     </dependency>
     <dependency>

Modified: incubator/accumulo/branches/1.3.5rc/src/trace/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3.5rc/src/trace/pom.xml?rev=1209542&r1=1209541&r2=1209542&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3.5rc/src/trace/pom.xml (original)
+++ incubator/accumulo/branches/1.3.5rc/src/trace/pom.xml Fri Dec  2 15:46:36 2011
@@ -36,7 +36,7 @@
       <artifactId>zookeeper</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.thrift</groupId>
+      <groupId>org.apache.accumulo.thrift</groupId>
       <artifactId>libthrift</artifactId>
     </dependency>
     <dependency>