diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml
index 1577bcb2df..5d8c7fad4d 100644
--- a/hadoop-client/pom.xml
+++ b/hadoop-client/pom.xml
@@ -115,6 +115,14 @@
net.java.dev.jets3t
jets3t
+
+ com.jcraft
+ jsch
+
+
+ commons-el
+ commons-el
+
@@ -131,6 +139,34 @@
org.apache.avro
avro
+
+ org.mortbay.jetty
+ jetty
+
+
+ org.mortbay.jetty
+ jetty-util
+
+
+ com.sun.jersey
+ jersey-core
+
+
+ com.sun.jersey
+ jersey-server
+
+
+ javax.servlet
+ servlet-api
+
+
+ javax.servlet.jsp
+ jsp-api
+
+
+ tomcat
+ jasper-runtime
+
@@ -171,6 +207,10 @@
jline
jline
+
+ io.netty
+ netty
+
@@ -207,6 +247,18 @@
org.apache.avro
avro
+
+ com.sun.jersey
+ jersey-core
+
+
+ com.sun.jersey
+ jersey-json
+
+
+ io.netty
+ netty
+
@@ -247,6 +299,14 @@
com.google.inject.extensions
guice-servlet
+
+ com.sun.jersey
+ jersey-json
+
+
+ io.netty
+ netty
+
@@ -271,6 +331,10 @@
com.google.inject.extensions
guice-servlet
+
+ io.netty
+ netty
+
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 466e6d4da8..1686a700ae 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -582,6 +582,8 @@ Release 2.0.4-alpha - UNRELEASED
HADOOP-9406. hadoop-client leaks dependency on JDK tools jar. (tucu)
+ HADOOP-9301. hadoop client servlet/jsp/jetty/tomcat JARs creating conflicts in Oozie & HttpFS. (tucu)
+
Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 373ba7cff3..59de5d1a68 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -223,6 +223,10 @@
jline
jline
+
+ org.jboss.netty
+ netty
+
junit