cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject svn commit: r824965 - in /incubator/cassandra/trunk: ./ interface/gen-java/org/apache/cassandra/service/ src/java/org/ test/unit/org/
Date Tue, 13 Oct 2009 22:54:08 GMT
Author: eevans
Date: Tue Oct 13 22:54:07 2009
New Revision: 824965

URL: http://svn.apache.org/viewvc?rev=824965&view=rev
Log:
merging 0.4 branch

Modified:
    incubator/cassandra/trunk/   (props changed)
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
  (props changed)
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java
  (props changed)
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
  (props changed)
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java
  (props changed)
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java
  (props changed)
    incubator/cassandra/trunk/pom.xml
    incubator/cassandra/trunk/src/java/org/   (props changed)
    incubator/cassandra/trunk/test/unit/org/   (props changed)

Propchange: incubator/cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 22:54:07 2009
@@ -1,2 +1,2 @@
 /incubator/cassandra/branches/cassandra-0.3:774578-796573
-/incubator/cassandra/branches/cassandra-0.4:810145-824815
+/incubator/cassandra/branches/cassandra-0.4:810145-824964

Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 22:54:07 2009
@@ -1,3 +1,3 @@
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
-/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java:810145-824815
+/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java:810145-824964
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java:749219-768588

Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 22:54:07 2009
@@ -1,4 +1,4 @@
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198
-/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java:810145-824815
+/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java:810145-824964
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java:749219-794428
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/column_t.java:749219-768588

Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 22:54:07 2009
@@ -1,3 +1,3 @@
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573
-/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:810145-824815
+/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:810145-824964
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:749219-768588

Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 22:54:07 2009
@@ -1,3 +1,3 @@
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573
-/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:810145-824815
+/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:810145-824964
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:749219-768588

Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 22:54:07 2009
@@ -1,4 +1,4 @@
 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198
-/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810145-824815
+/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810145-824964
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:749219-794428
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:749219-768588

Modified: incubator/cassandra/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/pom.xml?rev=824965&r1=824964&r2=824965&view=diff
==============================================================================
--- incubator/cassandra/trunk/pom.xml (original)
+++ incubator/cassandra/trunk/pom.xml Tue Oct 13 22:54:07 2009
@@ -25,7 +25,7 @@
 
   <groupId>org.apache.cassandra</groupId>
   <artifactId>cassandra</artifactId>
-  <version>0.4.0-dev</version>
+  <version>0.4.1</version>
   <packaging>jar</packaging>
   <name>Cassandra</name>
   <inceptionYear>2009</inceptionYear>
@@ -144,6 +144,16 @@
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.5.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.5.8</version>
+    </dependency>
+    <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr-runtime</artifactId>
       <version>3.1.3</version>
@@ -159,13 +169,6 @@
 
     <!-- Dependencies which I could not find in the maven repos -->
     <dependency>
-      <groupId>clhm</groupId>
-      <artifactId>clhm</artifactId>
-      <version>20090629</version>
-      <scope>system</scope>
-      <systemPath>${basedir}/lib/clhm-20090629.jar</systemPath>
-    </dependency>
-    <dependency>
       <groupId>high-scale-lib</groupId>
       <artifactId>high-scale-lib</artifactId>
       <version>UNKNOWN</version>
@@ -173,18 +176,18 @@
       <systemPath>${basedir}/lib/high-scale-lib.jar</systemPath>
     </dependency>
     <dependency>
-      <groupId>libthrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <version>UNKNOWN</version>
+      <groupId>flexjson</groupId>
+      <artifactId>flexjson</artifactId>
+      <version>1.7</version>
       <scope>system</scope>
-      <systemPath>${basedir}/lib/libthrift.jar</systemPath>
+      <systemPath>${basedir}/lib/flexjson-1.7.jar</systemPath>
     </dependency>
     <dependency>
-      <groupId>commons-javaflow</groupId>
-      <artifactId>commons-javaflow</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <groupId>libthrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>UNKNOWN</version>
       <scope>system</scope>
-      <systemPath>${basedir}/lib/commons-javaflow-1.0-SNAPSHOT.jar</systemPath>
+      <systemPath>${basedir}/lib/libthrift-r808609.jar</systemPath>
     </dependency>
 
     <!-- Testing Dependencies -->
@@ -278,6 +281,9 @@
             </property>
           </systemProperties>
           <forkMode>always</forkMode>
+          <excludes>
+            <exclude>**/TestRingCache.java</exclude>
+          </excludes>
         </configuration>
       </plugin>
 

Propchange: incubator/cassandra/trunk/src/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 22:54:07 2009
@@ -1,3 +1,3 @@
 /incubator/cassandra/branches/cassandra-0.3/src/java/org:774578-796573
-/incubator/cassandra/branches/cassandra-0.4/src/java/org:810145-824815
+/incubator/cassandra/branches/cassandra-0.4/src/java/org:810145-824964
 /incubator/cassandra/trunk/src/java/org:749219-769885

Propchange: incubator/cassandra/trunk/test/unit/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 22:54:07 2009
@@ -1,3 +1,3 @@
 /incubator/cassandra/branches/cassandra-0.3/test/unit/org:774578-796573
-/incubator/cassandra/branches/cassandra-0.4/test/unit/org:810145-824815
+/incubator/cassandra/branches/cassandra-0.4/test/unit/org:810145-824964
 /incubator/cassandra/trunk/test/unit/org:749219-768583



Mime
View raw message