Updated Branches: refs/heads/cassandra-1.2 5c8f0994f -> 6108a34bb refs/heads/trunk 985b84692 -> 534101959
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/53410195 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53410195 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53410195 Branch: refs/heads/trunk Commit: 5341019593f2c46019a718b716909eeea58ac2ca Parents: 985b846 Author: Aaron Morton <[email protected]> Authored: Wed Jan 9 11:03:18 2013 +1300 Committer: Aaron Morton <[email protected]> Committed: Wed Jan 9 14:22:21 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/53410195/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b2e0686..07a2286 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -36,6 +36,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/53410195/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 448cfc4..eb681eb 100644 --- a/build.xml +++ b/build.xml @@ -340,8 +340,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>
