From: Dan Timoney <dtimoney@att.com>
Date: Fri, 8 Sep 2017 21:03:41 +0000 (-0400)
Subject: Fix jettison version to match installed version
X-Git-Tag: v0.1.0~15
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=51afe8d0b024deba82289c04067ca0e4c37ebb16;p=ccsdk%2Fparent.git

Fix jettison version to match installed version

Update jettison.version setting to match the installed version in ODL
Carbon image (1.3.6), as opposed to version specified in ODL Carbon
odlparent (1.3.7).

Change-Id: Ibe9e11e7a98fd69561f5788443a799586f3845a3
Issue-ID: CCSDK-85
Signed-off-by: Dan Timoney <dtimoney@att.com>
---

diff --git a/odlparent-carbon-sr1/pom.xml b/odlparent-carbon-sr1/pom.xml
index fbf59306..115b4efe 100755
--- a/odlparent-carbon-sr1/pom.xml
+++ b/odlparent-carbon-sr1/pom.xml
@@ -122,7 +122,7 @@
         <org.json.version>20131018</org.json.version>
 
         <!-- Used by sfc -->
-        <jettison.version>1.3.7</jettison.version>
+        <jettison.version>1.3.6</jettison.version>
         <!-- Used by persistence -->
         <jsr305.api.version>3.0.0</jsr305.api.version>
         <!-- Need to stick to JUnit 4.11 until https://github.com/jayway/powermock/issues/560