From d3399bdc68b2b124e7ecf29bb1621153e8a1b957 Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@apache.org>
Date: Mon, 7 May 2018 16:03:07 +0200
Subject: [PATCH] AMBARI-23775. Removed (or upgraded) unsecure libraries from
 ambari-agent (#1193)

---
 ambari-agent/pom.xml   | 37 ++++++++++++++++++++++++++++++++++++-
 ambari-project/pom.xml |  5 +++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 33160468dac..945b672a941 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -58,7 +58,6 @@
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
-      <version>3.4.9</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
@@ -72,6 +71,12 @@
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
       <version>1.6</version>
+      <exclusions>
+        <exclusion>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
@@ -89,18 +94,48 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
       <version>2.7.3</version>
+      <exclusions>
+        <exclusion>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jsch</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-test</artifactId>
       <version>2.9.0</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-framework</artifactId>
       <version>2.7.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.ambari</groupId>
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 93ffd4bce97..e20a968fb7f 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -637,6 +637,11 @@
         <artifactId>jackson-databind</artifactId>
         <version>${fasterxml.jackson.version}</version>
       </dependency>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <version>3.4.10</version>
+    </dependency>
     </dependencies>
   </dependencyManagement>
   <build>