diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 253953a5d2e..c5dff293b7b 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -553,6 +553,9 @@ Release 0.23.0 - Unreleased HADOOP-7593. Fix AssertionError in TestHttpServer.testMaxThreads(). (Uma Maheswara Rao G via szetszwo) + HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required + by Jersey (Alejandro Abdelnur via atm) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 9e996470806..f012afd7766 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