cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/4] git commit: Ensure Jackson dependency matches lib
Date Wed, 09 Jan 2013 02:09:52 GMT
Ensure Jackson dependency matches lib

Patch by Nat McCall, reviewed by Aaron Morton for Cassandra-5126


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6108a34b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6108a34b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6108a34b

Branch: refs/heads/trunk
Commit: 6108a34bba013d547ee4c4c4e1e02ceccc9f2232
Parents: 5c8f099
Author: Aaron Morton <aaron@thelastpickle.com>
Authored: Wed Jan 9 11:03:18 2013 +1300
Committer: Aaron Morton <aaron@thelastpickle.com>
Committed: Wed Jan 9 14:00:54 2013 +1300

----------------------------------------------------------------------
 CHANGES.txt |    1 +
 build.xml   |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6108a34b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 22a3bbd..9a00105 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -29,6 +29,7 @@ Merged from 1.1:
  * Improve handling a changing target throttle rate mid-compaction (CASSANDRA-5087)
  * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
  * nodetool repair command now prints progress (CASSANDRA-4767)
+ * Ensure Jackson dependency matches lib (CASSANDRA-5126)
 
 
 1.2.0

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6108a34b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7614e1c..255b407 100644
--- a/build.xml
+++ b/build.xml
@@ -338,8 +338,8 @@
           <dependency groupId="org.antlr" artifactId="antlr" version="3.2"/>
           <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.2"/>
           <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" version="1.7.2"/>
-          <dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl" version="1.4.0"/>
-          <dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl" version="1.4.0"/>
+          <dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl" version="1.9.2"/>
+          <dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl" version="1.9.2"/>
           <dependency groupId="jline" artifactId="jline" version="1.0">
             <exclusion groupId="junit" artifactId="junit"/>
           </dependency>


Mime
View raw message