Author: lewismc
Date: Tue Jun 12 14:36:48 2012
New Revision: 1349375
URL: http://svn.apache.org/viewvc?rev=1349375&view=rev
Log:
commit to address GORA-140 and update to CHANGES.txt
Modified:
gora/trunk/CHANGES.txt
gora/trunk/gora-cassandra/pom.xml
gora/trunk/pom.xml
Modified: gora/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/gora/trunk/CHANGES.txt?rev=1349375&r1=1349374&r2=1349375&view=diff
==============================================================================
--- gora/trunk/CHANGES.txt (original)
+++ gora/trunk/CHANGES.txt Tue Jun 12 14:36:48 2012
@@ -6,6 +6,8 @@ Gora Change Log
0.3 (trunk) Current Development:
+* GORA-140 Requires some adjustments on dependency at gora-cassandra (kazk,
lewismc)
+
* GORA-138 gora-cassandra array type support: Double fix for GORA-81 Replace
CassandraStore#addOrUpdateField with TypeInferringSerializer to take advantage
of when the value is already of type ByteBuffer. (Kazuomi Kashii via lewismc)
* GORA-139 Creates Cassandra column family with BytesType for column value
validator (and comparators), instead of UTF8Type (Kazuomi Kashii via lewismc)
Modified: gora/trunk/gora-cassandra/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-cassandra/pom.xml?rev=1349375&r1=1349374&r2=1349375&view=diff
==============================================================================
--- gora/trunk/gora-cassandra/pom.xml (original)
+++ gora/trunk/gora-cassandra/pom.xml Tue Jun 12 14:36:48 2012
@@ -120,11 +120,6 @@
<!-- Cassandra Dependencies -->
<dependency>
<groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-all</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-thrift</artifactId>
</dependency>
@@ -147,13 +142,17 @@
<!-- Logging Dependencies -->
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
Modified: gora/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/pom.xml?rev=1349375&r1=1349374&r2=1349375&view=diff
==============================================================================
--- gora/trunk/pom.xml (original)
+++ gora/trunk/pom.xml Tue Jun 12 14:36:48 2012
@@ -523,10 +523,9 @@
<avro.version>1.3.3</avro.version>
<cxf-rt-frontend-jaxrs.version>2.5.2</cxf-rt-frontend-jaxrs.version>
<!-- Cassandra Dependencies -->
- <cassandra.version>1.0.2</cassandra.version>
- <cassandra.thrift.version>1.0.2</cassandra.thrift.version>
+ <cassandra.thrift.version>1.1.1</cassandra.thrift.version>
<libthrift.version>0.7.0</libthrift.version>
- <hector.version>1.0-1</hector.version>
+ <hector.version>1.0-4</hector.version>
<!-- Misc Dependencies -->
<guava.version>10.0.1</guava.version>
<commons-lang.version>2.6</commons-lang.version>
@@ -698,12 +697,6 @@
<!-- Cassandra Dependencies -->
<dependency>
<groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-all</artifactId>
- <version>${cassandra.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-thrift</artifactId>
<version>${cassandra.thrift.version}</version>
</dependency>
@@ -781,6 +774,12 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
