diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 4e45005d30a..0fb77019d59 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -463,6 +463,8 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9958. Add old constructor back to DelegationTokenInformation to unbreak downstream builds. (Andrew Wang) + HADOOP-9960. Upgrade Jersey version to 1.9. (Karthik Kambatla via atm) + Release 2.1.0-beta - 2013-08-22 INCOMPATIBLE CHANGES diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index bc7e802a2db..316be600309 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -59,6 +59,9 @@ ${basedir}/../../hadoop-common-project/hadoop-common/target file:///dev/urandom + + 1.9 + 2.5.0 @@ -365,12 +368,12 @@ com.sun.jersey jersey-core - 1.8 + ${jersey.version} com.sun.jersey jersey-json - 1.8 + ${jersey.version} javax.xml.stream @@ -381,7 +384,7 @@ com.sun.jersey jersey-server - 1.8 + ${jersey.version} @@ -399,19 +402,19 @@ com.sun.jersey.contribs jersey-guice - 1.8 + ${jersey.version} com.sun.jersey.jersey-test-framework jersey-test-framework-core - 1.8 + ${jersey.version} test com.sun.jersey.jersey-test-framework jersey-test-framework-grizzly2 - 1.8 + ${jersey.version}