diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 6d9a2e8bcf2..4bf22eb574b 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -38,6 +38,7 @@
1.7.20
4.1.0
4.3.7.RELEASE
+ 2.9.4
4
false
-Xmx1024m -Xms512m
@@ -82,6 +83,22 @@
+
+ commons-collections
+ commons-collections
+ 3.2.2
+
+
+ commons-beanutils
+ commons-beanutils
+ 1.9.3
+
+
+ commons-collections
+ commons-collections
+
+
+
commons-io
commons-io
@@ -92,6 +109,11 @@
commons-csv
1.1
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.5
+
org.codehaus.jettison
jettison
@@ -359,15 +381,10 @@
jackson-mapper-asl
1.9.13
-
- com.fasterxml.jackson.core
- jackson-databind
- 2.8.7
-
com.fasterxml.jackson.jaxrs
jackson-jaxrs-json-provider
- 2.8.7
+ ${fasterxml.jackson.version}
@@ -595,6 +612,16 @@
swagger-maven-plugin
${swagger.maven.plugin.version}
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ ${fasterxml.jackson.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${fasterxml.jackson.version}
+
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 995ca18dfe8..329822c0048 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1149,6 +1149,14 @@
ambari-views
${project.version}
+
+ commons-collections
+ commons-collections
+
+
+ commons-beanutils
+ commons-beanutils
+
commons-io
commons-io
@@ -1408,10 +1416,6 @@
org.codehaus.jackson
jackson-xc
-
- com.fasterxml.jackson.core
- jackson-databind
-
com.sun.jersey.jersey-test-framework
jersey-test-framework-core
@@ -1561,7 +1565,6 @@
org.apache.httpcomponents
httpclient
- 4.2.5
com.google.code.findbugs
@@ -1588,6 +1591,12 @@
org.apache.velocity
velocity
1.7
+
+
+ commons-collections
+ commons-collections
+
+
com.sun.mail
@@ -1608,11 +1617,24 @@
org.apache.ambari
ambari-metrics-common
${project.version}
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
+ org.apache.curator
+ curator-framework
+
+
com.fasterxml.jackson.core
jackson-annotations
- 2.8.7
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
net.sf.ehcache
@@ -1640,6 +1662,14 @@
org.apache.directory.server
apacheds-kerberos-codec
+
+ org.apache.httpcomponents
+ httpclient
+
+
+ org.apache.zookeeper
+ zookeeper
+
@@ -1647,6 +1677,26 @@
hadoop-common
${hadoop.version}
+
+ commons-collections
+ commons-collections
+
+
+ commons-beanutils
+ commons-beanutils
+
+
+ commons-beanutils
+ commons-beanutils-core
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
+ commons-httpclient
+ commons-httpclient
+
javax.servlet
servlet-api
@@ -1655,6 +1705,10 @@
org.mortbay.jetty
jetty-util
+
+ org.apache.zookeeper
+ zookeeper
+
@@ -1688,6 +1742,12 @@
org.apache.ambari
ambari-serviceadvisor
1.0.0.0-SNAPSHOT
+
+
+ commons-httpclient
+ commons-httpclient
+
+
@@ -1696,6 +1756,16 @@
ambari-utility
1.0.0.0-SNAPSHOT
provided
+
+
+ commons-collections
+ commons-collections
+
+
+ commons-beanutils
+ commons-beanutils
+
+
org.kohsuke
@@ -1716,12 +1786,24 @@
org.apache.directory.server
kerberos-client
2.0.0-M24
+
+
+ commons-collections
+ commons-collections
+
+
com.networknt
json-schema-validator
0.1.10
test
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 6fd9837acd4..7f0127f4c26 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -121,8 +121,8 @@
import org.apache.ambari.server.view.ViewDirectoryWatcher;
import org.apache.ambari.server.view.ViewRegistry;
import org.apache.ambari.server.view.ViewThrottleFilter;
-import org.apache.commons.httpclient.HttpVersion;
import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpVersion;
import org.apache.log4j.PropertyConfigurator;
import org.apache.velocity.app.Velocity;
import org.eclipse.jetty.server.Handler;
diff --git a/ambari-utility/pom.xml b/ambari-utility/pom.xml
index e16f1af1b2f..ac6f30cb454 100644
--- a/ambari-utility/pom.xml
+++ b/ambari-utility/pom.xml
@@ -52,6 +52,14 @@
log4j
provided
+
+ commons-beanutils
+ commons-beanutils
+
+
+ commons-collections
+ commons-collections
+
junit
junit
@@ -65,6 +73,14 @@
com.sun
tools
+
+ commons-beanutils
+ commons-beanutils
+
+
+ commons-collections
+ commons-collections
+
@@ -83,6 +99,12 @@
org.easymock
easymock
test
+
+
+ commons-beanutils
+ commons-beanutils
+
+