diff options
author | deen1985 <damian.nowak@nokia.com> | 2020-08-05 17:54:22 +0200 |
---|---|---|
committer | deen1985 <damian.nowak@nokia.com> | 2020-08-06 14:53:29 +0200 |
commit | ee146f34aff276b4965e3569afbb62d24a66b60b (patch) | |
tree | b3efaf06d81dcd039a50ff0dfa12cf36e94e7d17 /prh-app-server | |
parent | a2b4615e8cdcd43fb9292f21d9617dbe48dcc9a8 (diff) |
DCAE-PRH Fix lib vulnerabilities
Change-Id: I55d230a82ab58f99b89c49162bf952799e115ff4
Signed-off-by: deen1985 <damian.nowak@nokia.com>
Issue-ID: DCAEGEN2-2276
Signed-off-by: deen1985 <damian.nowak@nokia.com>
Diffstat (limited to 'prh-app-server')
-rw-r--r-- | prh-app-server/Dockerfile | 2 | ||||
-rw-r--r-- | prh-app-server/pom.xml | 29 | ||||
-rw-r--r-- | prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/SwaggerConfig.java | 5 |
3 files changed, 10 insertions, 26 deletions
diff --git a/prh-app-server/Dockerfile b/prh-app-server/Dockerfile index 22a9b468..d92dae8f 100644 --- a/prh-app-server/Dockerfile +++ b/prh-app-server/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/openjdk:11-jre-slim -LABEL copyright="Copyright (C) 2018-2019 NOKIA" \ +LABEL copyright="Copyright (C) 2018-2020 NOKIA" \ license.name="The Apache Software License, Version 2.0" \ license.url="http://www.apache.org/licenses/LICENSE-2.0" \ maintainer="Nokia Wroclaw ONAP Team" diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml index d1de2666..d31e9111 100644 --- a/prh-app-server/pom.xml +++ b/prh-app-server/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ PNF-REGISTRATION-HANDLER ~ ================================================================================ - ~ Copyright (C) 2018-2019 NOKIA Intellectual Property. All rights reserved. + ~ 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. @@ -197,22 +197,6 @@ </image> </images> </configuration> -<!-- <executions> - <execution> - <id>docker-build-image</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - <execution> - <id>docker-push-image</id> - <phase>deploy</phase> - <goals> - <goal>push</goal> - </goals> - </execution> - </executions> --> </plugin> </plugins> </build> @@ -246,11 +230,7 @@ </dependency> <dependency> <groupId>io.springfox</groupId> - <artifactId>springfox-swagger2</artifactId> - </dependency> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger-ui</artifactId> + <artifactId>springfox-boot-starter</artifactId> </dependency> <dependency> <groupId>io.projectreactor</groupId> @@ -278,6 +258,11 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> <dependency> <groupId>org.junit.jupiter</groupId> diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/SwaggerConfig.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/SwaggerConfig.java index ecd2ef4c..4039f698 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/SwaggerConfig.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/SwaggerConfig.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * PNF-REGISTRATION-HANDLER * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved. + * 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. @@ -34,7 +34,6 @@ import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; -@EnableSwagger2 @Configuration @Profile("prod") public class SwaggerConfig extends WebMvcConfigurationSupport { @@ -80,4 +79,4 @@ public class SwaggerConfig extends WebMvcConfigurationSupport { registry.addResourceHandler(WEBJARS) .addResourceLocations(WEBJARS_PATH); } -}
\ No newline at end of file +} |