From: Jonathan Gathman <jonathan.gathman@att.com>
Date: Thu, 10 Jan 2019 09:18:08 +0000 (+0000)
Subject: Merge "Replace Jackson Spring-Boot dependencies with GSON"
X-Git-Tag: 2.1.10~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d348d122d5880540a0f6e48182efdb0fbcf0c5d0;hp=965dac7a82d2962a9c6d0c1dfc1d52f4b7e05916;p=aaf%2Fcadi.git

Merge "Replace Jackson Spring-Boot dependencies with GSON"
---

diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml
index 2608254..e0395b8 100644
--- a/sidecar/fproxy/pom.xml
+++ b/sidecar/fproxy/pom.xml
@@ -70,13 +70,22 @@
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-starter-tomcat</artifactId>
 				</exclusion>
-			</exclusions>			
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-json</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>