summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorTony Hansen <tony@att.com>2020-08-11 15:16:14 +0000
committerGerrit Code Review <gerrit@onap.org>2020-08-11 15:16:14 +0000
commit3e872d7f1be90810bc7920f4ab0cbc03d5c502d9 (patch)
treee8149ec837aabb7a4ba615cb23a7e81a6949d3c1 /components
parent965aa42e6435035b0379602b3a82c4797f35b188 (diff)
parent06aa74fb7f94297475ee4b8d170688bb9f80d163 (diff)
Merge "Revert "BBS-EP vulnerability fix""
Diffstat (limited to 'components')
-rw-r--r--components/bbs-event-processor/pom.xml44
-rw-r--r--components/bbs-event-processor/src/main/java/org/onap/bbs/event/processor/config/SwaggerConfiguration.java5
2 files changed, 20 insertions, 29 deletions
diff --git a/components/bbs-event-processor/pom.xml b/components/bbs-event-processor/pom.xml
index 5bd91d8b..ff98f43c 100644
--- a/components/bbs-event-processor/pom.xml
+++ b/components/bbs-event-processor/pom.xml
@@ -1,23 +1,4 @@
<?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">
@@ -50,10 +31,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.version>3.0.0</springfox.version>
+ <springfox-swagger.version>2.9.2</springfox-swagger.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>
@@ -84,8 +65,13 @@
</dependency>
<dependency>
<groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- <version>${springfox.version}</version>
+ <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>
</dependency>
<dependency>
<groupId>org.immutables</groupId>
@@ -143,10 +129,14 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- </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.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 1dbf0f6c..c3c87da2 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-2020 NOKIA Intellectual Property. All rights reserved.
+ * Copyright (C) 2019 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,6 +34,7 @@ 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 {
@@ -79,4 +80,4 @@ public class SwaggerConfiguration extends WebMvcConfigurationSupport {
registry.addResourceHandler(WEBJARS)
.addResourceLocations(WEBJARS_PATH);
}
-}
+} \ No newline at end of file