diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c3866a2a201..055a457ebe6 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -152,6 +152,9 @@ Release 2.6.0 - UNRELEASED HADOOP-11021. Configurable replication factor in the hadoop archive command. (Zhe Zhang via wang) + HADOOP-11030. Define a variable jackson.version instead of using constant + at multiple places. (Juan Yu via kasha) + OPTIMIZATIONS HADOOP-10838. Byte array native checksumming. (James Thomas via todd) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 08959e325bb..33cdff569ee 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -61,6 +61,9 @@ 1.9 + + 1.9.13 + 2.5.0 @@ -660,22 +663,22 @@ org.codehaus.jackson jackson-mapper-asl - 1.9.13 + ${jackson.version} org.codehaus.jackson jackson-core-asl - 1.9.13 + ${jackson.version} org.codehaus.jackson jackson-jaxrs - 1.9.13 + ${jackson.version} org.codehaus.jackson jackson-xc - 1.9.13 + ${jackson.version} org.mockito