diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index abe898fbd6a..3e6fc3ad98d 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -193,6 +193,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 0ecd5b2045c..60ecb1d6c83 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 @@ -364,12 +367,12 @@ com.sun.jersey jersey-core - 1.8 + ${jersey.version} com.sun.jersey jersey-json - 1.8 + ${jersey.version} javax.xml.stream @@ -380,7 +383,7 @@ com.sun.jersey jersey-server - 1.8 + ${jersey.version} @@ -398,19 +401,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}