From dd8253f6c5c587735560982ca23cbfc320ae9d30 Mon Sep 17 00:00:00 2001
From: deen1985 <damian.nowak@nokia.com>
Date: Wed, 5 Aug 2020 18:02:51 +0200
Subject: BBS-EP vulnerability fix

Change-Id: I2319d14109cad54c524a8e4752aa124b098fedbd
Signed-off-by: deen1985 <damian.nowak@nokia.com>
Issue-ID: DCAEGEN2-2273
Signed-off-by: deen1985 <damian.nowak@nokia.com>
---
 components/bbs-event-processor/pom.xml             | 44 +++++++++++++---------
 .../processor/config/SwaggerConfiguration.java     |  5 +--
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/components/bbs-event-processor/pom.xml b/components/bbs-event-processor/pom.xml
index 7d8c43f0..61403965 100644
--- a/components/bbs-event-processor/pom.xml
+++ b/components/bbs-event-processor/pom.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ ============LICENSE_START=======================================================
+  ~ BBE-EVENT-PROCESSOR
+  ~ ================================================================================
+  ~ Copyright (C) 2018-2020 NOKIA Intellectual Property. All rights reserved.
+  ~ ================================================================================
+  ~ 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.
+  ~ ============LICENSE_END=========================================================
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -31,10 +50,10 @@
         <spring-boot.version>2.1.12.RELEASE</spring-boot.version>
         <junit-platform.version>1.1.0</junit-platform.version>
         <jacoco.version>0.8.2</jacoco.version>
-        <dcae.sdk.version>1.3.4</dcae.sdk.version>
+	<dcae.sdk.version>1.3.4</dcae.sdk.version>
         <wiremock.version>2.24.0</wiremock.version>
         <jaxb.api.version>2.3.0</jaxb.api.version>
-        <springfox-swagger.version>2.9.2</springfox-swagger.version>
+        <springfox.version>3.0.0</springfox.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
         <bbs-event-processor.main.class>org.onap.bbs.event.processor.Application</bbs-event-processor.main.class>
         <dependency.dir.name>libs</dependency.dir.name>
@@ -65,13 +84,8 @@
             </dependency>
             <dependency>
                 <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger2</artifactId>
-                <version>${springfox-swagger.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger-ui</artifactId>
-                <version>${springfox-swagger.version}</version>
+                <artifactId>springfox-boot-starter</artifactId>
+                <version>${springfox.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.immutables</groupId>
@@ -129,14 +143,10 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-        </dependency>
+	<dependency>
+		<groupId>io.springfox</groupId>
+                <artifactId>springfox-boot-starter</artifactId>
+	</dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
diff --git a/components/bbs-event-processor/src/main/java/org/onap/bbs/event/processor/config/SwaggerConfiguration.java b/components/bbs-event-processor/src/main/java/org/onap/bbs/event/processor/config/SwaggerConfiguration.java
index c3c87da2..1dbf0f6c 100644
--- a/components/bbs-event-processor/src/main/java/org/onap/bbs/event/processor/config/SwaggerConfiguration.java
+++ b/components/bbs-event-processor/src/main/java/org/onap/bbs/event/processor/config/SwaggerConfiguration.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * BBS-RELOCATION-CPE-AUTHENTICATION-HANDLER
  * ================================================================================
- * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2020 NOKIA Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@ import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-@EnableSwagger2
 @Configuration
 @Profile("production")
 public class SwaggerConfiguration extends WebMvcConfigurationSupport {
@@ -80,4 +79,4 @@ public class SwaggerConfiguration extends WebMvcConfigurationSupport {
         registry.addResourceHandler(WEBJARS)
                 .addResourceLocations(WEBJARS_PATH);
     }
-}
\ No newline at end of file
+}
-- 
cgit 1.2.3-korg