diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 4f0c4cc2ac..206f6649f5 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -4,9 +4,14 @@ Trunk (unreleased changes) IMPROVEMENTS - HADOOP-7595. Upgrade dependency to Avro 1.5.3. (Alejandro Abdelnur via atm) + HADOOP-7595. Upgrade dependency to Avro 1.5.3. (Alejandro Abdelnur via atm) HADOOP-7524 Change RPC to allow multiple protocols including multuple versions of the same protocol (sanjay Radia) + BUGS + + HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required + by Jersey (Alejandro Abdelnur via atm) + Release 0.23.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index a1561934ed..290d33d02f 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -344,7 +344,7 @@ org.codehaus.jackson jackson-mapper-asl - 1.6.9 + 1.7.1 org.aspectj