From a971f1b818693e0a536623c89c3ddeaccbf58074 Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@hortonworks.com>
Date: Fri, 23 Feb 2018 13:45:17 +0100
Subject: [PATCH] AMBARI-23064. Upgrading jackson-databind (plus
 jackson-annotations and jackson-core) to 2.9.4 due to security concerns

---
 ambari-project/pom.xml | 11 +++++++++++
 ambari-server/pom.xml  | 11 ++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index b2e2c83ef02..30dcb4f6560 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -32,6 +32,7 @@
     <jetty.version>8.1.19.v20160209</jetty.version>
     <checkstyle.version>6.19</checkstyle.version> <!-- last version that does not require Java 8 -->
     <checkstyle.skip>false</checkstyle.skip>
+    <fasterxml.jackson.version>2.9.4</fasterxml.jackson.version>
     <forkCount>4</forkCount>
     <reuseForks>false</reuseForks>
     <surefire.argLine>-Xmx1024m -XX:MaxPermSize=512m -Xms512m</surefire.argLine>
@@ -487,6 +488,16 @@
         <artifactId>checkstyle</artifactId>
         <version>${checkstyle.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+        <version>${fasterxml.jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${fasterxml.jackson.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index b8ed2955fa8..454f8d40f39 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1446,7 +1446,10 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.8.0</version>
+    </dependency>
+   <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
     </dependency>
     <dependency>
       <groupId>net.sf.ehcache</groupId>
@@ -1539,6 +1542,12 @@
       <artifactId>json-schema-validator</artifactId>
       <version>0.1.10</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>