From aec7ea166403a3319cf558460881164834694c1f Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Fri, 14 Sep 2018 10:34:25 -0400
Subject: [PATCH] Upgrade springframework 4.3.18.RELEASE

To resolve security issue for 4.3.15.RELEASE and also
have a single place where the dependency is defined for
the sub-modules.

NOTE: 4.2.0.RELEASE is left alone in Policy SDK App
due to Portal SDK dependency.

Issue-ID: POLICY-1063
Change-Id: Ibdc464b16b4771faccb2c8c472efa7fbcbf3352c
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 .gitignore              | 1 +
 ONAP-PAP-REST/pom.xml   | 1 -
 ONAP-PDP-REST/pom.xml   | 3 ---
 ONAP-REST/pom.xml       | 1 -
 PolicyEngineAPI/pom.xml | 2 +-
 pom.xml                 | 1 +
 6 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 51ab338da..7df831f3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ PolicyEngineAPI/logs/
 PolicyEngineAPI/POLICY_LOGS_IS_UNDEFINED/
 PolicyEngineUtils/logs/
 ONAP-REST/logs/common-modules/integrity-monitor/*.log
+ONAP-SDK-APP/POLICY_LOGS_IS_UNDEFINED
diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index 94e0aff13..a3ed2a561 100644
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -298,7 +298,6 @@
         </dependency>
     </dependencies>
     <properties>
-        <springframework.version>4.3.15.RELEASE</springframework.version>
         <hibernate.version>4.3.10.Final</hibernate.version>
         <projectversion>2.0.2</projectversion>
     </properties>
diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index 97df34daa..1aed0700c 100644
--- a/ONAP-PDP-REST/pom.xml
+++ b/ONAP-PDP-REST/pom.xml
@@ -29,9 +29,6 @@
     </parent>
     <artifactId>ONAP-PDP-REST</artifactId>
     <description>ONAP PDP REST</description>
-    <properties>
-        <springframework.version>4.3.15.RELEASE</springframework.version>
-    </properties>
     <packaging>war</packaging>
     <build>
         <plugins>
diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index be5fe6e5f..924e11662 100644
--- a/ONAP-REST/pom.xml
+++ b/ONAP-REST/pom.xml
@@ -34,7 +34,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <springframework.version>4.3.15.RELEASE</springframework.version>
         <hibernate.version>4.3.10.Final</hibernate.version>
     </properties>
 
diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index 874409d4a..0311dc267 100644
--- a/PolicyEngineAPI/pom.xml
+++ b/PolicyEngineAPI/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>4.3.15.RELEASE</version>
+            <version>${springframework.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
diff --git a/pom.xml b/pom.xml
index 1cddd321a..6e73a2c41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
         <!-- Shared between policy/* project repositories - different version -->
 
         <!-- Project common dependency versions -->
+        <springframework.version>4.3.18.RELEASE</springframework.version>
         <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
         <httpclient.version>4.5.5</httpclient.version>
         <jackson.version>2.9.4</jackson.version>
-- 
2.16.6