diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c064bb6a9ac..3865d28abf8 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -232,6 +232,8 @@ Release 2.4.0 - UNRELEASED HADOOP-10125. no need to process RPC request if the client connection has been dropped (Ming Ma via brandonli) + HADOOP-10235. Hadoop tarball has 2 versions of stax-api JARs. (tucu) + Release 2.3.0 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 6fb667edcdf..22cd5fe5d2b 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -416,7 +416,7 @@ ${jersey.version} - javax.xml.stream + stax stax-api @@ -764,6 +764,12 @@ org.codehaus.jettison jettison 1.1 + + + stax + stax-api + + com.sun.jersey