Repository: hadoop Updated Branches: refs/heads/branch-2 f6319b513 -> 05ae7983c
HADOOP-11030. Define a variable jackson.version instead of using constant at multiple places. (Juan Yu via kasha) (cherry picked from commit 9ad413b19d98352e4ae848a945ab1f72ababa576) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/05ae7983 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/05ae7983 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/05ae7983 Branch: refs/heads/branch-2 Commit: 05ae7983c642a77f8cda1211db937a2f4449d92c Parents: f6319b5 Author: Karthik Kambatla <[email protected]> Authored: Fri Aug 29 15:55:25 2014 -0700 Committer: Karthik Kambatla <[email protected]> Committed: Fri Aug 29 15:57:29 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-project/pom.xml | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/05ae7983/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c3866a2..055a457 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) http://git-wip-us.apache.org/repos/asf/hadoop/blob/05ae7983/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 08959e3..33cdff5 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -61,6 +61,9 @@ <!-- jersey version --> <jersey.version>1.9</jersey.version> + <!-- jackson version --> + <jackson.version>1.9.13</jackson.version> + <!-- ProtocolBuffer version, used to verify the protoc version and --> <!-- define the protobuf JAR version --> <protobuf.version>2.5.0</protobuf.version> @@ -660,22 +663,22 @@ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.13</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> - <version>1.9.13</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-jaxrs</artifactId> - <version>1.9.13</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-xc</artifactId> - <version>1.9.13</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.mockito</groupId>
