From 95ba8a85dacd65101f550e2d32dda33780b16dbd Mon Sep 17 00:00:00 2001
From: bobbymander <bobby.mander@att.com>
Date: Fri, 30 Mar 2018 09:31:32 -0400
Subject: [PATCH] POM fixes due to update in cadi-aaf

Issue-ID: POLICY-507
Change-Id: I493233f8e0e90eaf24e9c09c7433c6fb9fadb268
Signed-off-by: bobbymander <bobby.mander@att.com>
---
 ONAP-PAP-REST/pom.xml     | 5 -----
 POLICY-SDK-APP/pom.xml    | 5 -----
 PolicyEngineAPI/pom.xml   | 5 -----
 PolicyEngineUtils/pom.xml | 7 +------
 pom.xml                   | 8 +++++++-
 5 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index de3737837..9d3d3d22a 100644
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -257,11 +257,6 @@
 			<artifactId>jackson-core</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-jaxb-annotations</artifactId>
diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml
index 08bc3c23c..9f7f26742 100644
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -161,11 +161,6 @@
 			<artifactId>jackson-core</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-jaxb-annotations</artifactId>
diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index 69e086978..d43dd4b27 100644
--- a/PolicyEngineAPI/pom.xml
+++ b/PolicyEngineAPI/pom.xml
@@ -29,11 +29,6 @@
 	</parent>
 	<artifactId>PolicyEngineAPI</artifactId>
 	<dependencies>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.glassfish</groupId>
 			<artifactId>javax.json</artifactId>
diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 85b506a21..9ae92caa8 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -57,11 +57,6 @@
 			<artifactId>mariadb-java-client</artifactId>
 			<version>2.1.1</version>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.github.fge</groupId>
 			<artifactId>json-patch</artifactId>
@@ -104,7 +99,7 @@
 		<dependency>
   			<groupId>org.onap.aaf.cadi</groupId>
   			<artifactId>cadi-aaf</artifactId>
-  			<version>1.0.0-SNAPSHOT</version>
+  			<version>1.0.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>com.google.code.gson</groupId>
diff --git a/pom.xml b/pom.xml
index 61e5d3239..1039e3ae4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 		<jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
 		<dmaap.version>1.1.3</dmaap.version>
 		<httpclient.version>4.5.5</httpclient.version>
-		<jackson.version>2.9.5</jackson.version>
+		<jackson.version>2.9.4</jackson.version>
 		<commons.fileupload.version>1.3.3</commons.fileupload.version>
 	</properties>
 	<modules>
@@ -137,6 +137,12 @@
 			<artifactId>xml-apis</artifactId>
 			<version>1.3.03</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+		<dependency>
+		    <groupId>com.fasterxml.jackson.core</groupId>
+		    <artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-- 
2.16.6