summaryrefslogtreecommitdiffstats
path: root/ResmanagementService/service/src
diff options
context:
space:
mode:
authorVictor Gao <victor.gao@huawei.com>2018-11-15 15:44:17 +0800
committerVictor Gao <victor.gao@huawei.com>2018-11-15 15:44:17 +0800
commitea18924cd5505f5e36ea58e7424db54c41db4605 (patch)
treeb1ac2d0cc3694449ccd383304ecffcfb05f3bcb3 /ResmanagementService/service/src
parent24682fda345a40769d693dc8981754df0f8bc191 (diff)
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>
Diffstat (limited to 'ResmanagementService/service/src')
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java59
-rw-r--r--ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml2
-rw-r--r--ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml2
3 files changed, 2 insertions, 61 deletions
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java
deleted file mode 100644
index 300ee7d..0000000
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2016 Huawei Technologies Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.vfc.nfvo.resmanagement.service.activator;
-
-import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapterMgrService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
-
-/**
- * <br>
- * <p>
- * </p>
- *
- * @author
- * @version VFC 1.0 Sep 22, 2016
- */
-public class ROAResmgrServicePostProcessor implements DestructionAwareBeanPostProcessor {
-
- private static final Logger LOG = LoggerFactory.getLogger(ROAResmgrServicePostProcessor.class);
-
- @Override
- public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
- if(bean instanceof IResmgrAdapterMgrService) {
- LOG.warn("Register to Microservice BUS!");
- IResmgrAdapterMgrService resmgrAdapterSvc = (IResmgrAdapterMgrService)bean;
- resmgrAdapterSvc.register();
- }
-
- return bean;
- }
-
- @Override
- public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
- LOG.info("postProcessBeforeInitialization");
- return bean;
- }
-
- @Override
- public void postProcessBeforeDestruction(Object bean, String name) throws BeansException {
- LOG.info("postProcessBeforeDestruction");
- }
-
-}
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>