From cd4c2f156147a884d4ee1a1927d5ccbfedd5c1f8 Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@hortonworks.com>
Date: Thu, 22 Feb 2018 17:57:46 +0100
Subject: [PATCH 1/2] AMBARI-23054. Upgaring commons-beanutils dependency in
 ambari-server to 1.9.3

---
 ambari-project/pom.xml |  5 +++++
 utility/pom.xml        | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 3b62ce12f4c..8a05ec119b1 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -76,6 +76,11 @@
   </profiles>
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>1.9.3</version>
+      </dependency>
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
diff --git a/utility/pom.xml b/utility/pom.xml
index 2617ba9d75c..e2646a807b3 100644
--- a/utility/pom.xml
+++ b/utility/pom.xml
@@ -32,6 +32,10 @@
   <version>1.0.0.0-SNAPSHOT</version>
 
   <dependencies>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -45,6 +49,10 @@
           <groupId>com.sun</groupId>
           <artifactId>tools</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>commons-beanutils</groupId>
+          <artifactId>commons-beanutils</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -53,6 +61,12 @@
       <type>test-jar</type>
       <version>${checkstyle.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-beanutils</groupId>
+          <artifactId>commons-beanutils</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

From febf691789f5ff6aa316023a79af939ce65c5d6b Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@hortonworks.com>
Date: Fri, 23 Feb 2018 07:39:33 +0100
Subject: [PATCH 2/2] AMBARI-23054. Removing commons-beanutils-core dependency
 from ambari-server too since in 1.9.x there is no more JAR split within
 commons-beanutils

---
 ambari-server/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index eece7391aca..374701b7691 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1485,6 +1485,10 @@
       <artifactId>hadoop-common</artifactId>
       <version>${hadoop.version}</version>
       <exclusions>
+        <exclusion>
+          <groupId>commons-beanutils</groupId>
+          <artifactId>commons-beanutils-core</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>javax.servlet</groupId>
           <artifactId>servlet-api</artifactId>