From ea18924cd5505f5e36ea58e7424db54c41db4605 Mon Sep 17 00:00:00 2001
From: Victor Gao <victor.gao@huawei.com>
Date: Thu, 15 Nov 2018 15:44:17 +0800
Subject: Fix vulnerability issue in resmgr

upgrade springframework from 3.x to 4.x

CVE-2016-6812
CVE-2018-1270
CVE-2018-11039
SONATYPE-2015-0002
CVE-2014-3578
CVE-2018-1257
CVE-2017-12624
CVE-2018-8039

Change-Id: I59014c277df9bf201bb672a108a82a2deb0ed95b
Issue-ID: VFC-1187
Signed-off-by: Victor Gao <victor.gao@huawei.com>
---
 .../service/src/main/resources/spring/Resmanagement/services.xml        | 2 +-
 .../service/src/main/resources/spring/Resmanagement/svc_register.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'ResmanagementService/service/src/main/resources/spring')

diff --git a/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml b/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml
index e60bf19..db1eccb 100644
--- a/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml
+++ b/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml
@@ -35,7 +35,7 @@
     http://cxf.apache.org/transports/http/configuration
     http://cxf.apache.org/schemas/configuration/http-conf.xsd
     http://www.springframework.org/schema/aop
-    http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+    http://www.springframework.org/schema/aop/spring-aop.xsd">
 
     <!-- these are included in the dependency jar -->
     <import resource="classpath:META-INF/cxf/cxf.xml" />
diff --git a/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml b/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml
index 1306e39..e17d2d2 100644
--- a/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml
+++ b/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml
@@ -36,7 +36,7 @@
     http://cxf.apache.org/schemas/configuration/http-conf.xsd
     http://www.springframework.org/schema/aop
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd 
-    http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+    http://www.springframework.org/schema/aop/spring-aop.xsd">
     <!-- 
     <bean class="org.onap.vfc.nfvo.resmanagement.service.activator.ROAResmgrServicePostProcessor"></bean>
     <bean class="org.onap.vfc.nfvo.resmanagement.service.adapter.impl.ResmgrAdapterMgrService"></bean>
-- 
cgit 1.2.3-korg