From ee146f34aff276b4965e3569afbb62d24a66b60b Mon Sep 17 00:00:00 2001
From: deen1985 <damian.nowak@nokia.com>
Date: Wed, 5 Aug 2020 17:54:22 +0200
Subject: 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>
---
 pom.xml                                            | 21 ++++++++--------
 prh-app-server/Dockerfile                          |  2 +-
 prh-app-server/pom.xml                             | 29 ++++++----------------
 .../services/prh/configuration/SwaggerConfig.java  |  5 ++--
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/pom.xml b/pom.xml
index db3de14a..5d898f31 100644
--- a/pom.xml
+++ b/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.
@@ -47,11 +47,12 @@
 
   <properties>
     <java.version>11</java.version>
-    <spring-boot.version>2.2.1.RELEASE</spring-boot.version>
+    <spring-boot.version>2.2.4.RELEASE</spring-boot.version>
     <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
-    <springfox.version>2.9.2</springfox.version>
+    <springfox.version>3.0.0</springfox.version>
     <immutables.version>2.7.5</immutables.version>
-    <sdk.version>1.3.4</sdk.version>
+    <sdk.version>1.4.0</sdk.version>
+    <guava.version>29.0-jre</guava.version>
     <sonar.coverage.jacoco.xmlReportPaths>
       ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
     </sonar.coverage.jacoco.xmlReportPaths>
@@ -172,12 +173,7 @@
       </dependency>
       <dependency>
         <groupId>io.springfox</groupId>
-        <artifactId>springfox-swagger2</artifactId>
-        <version>${springfox.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.springfox</groupId>
-        <artifactId>springfox-swagger-ui</artifactId>
+        <artifactId>springfox-boot-starter</artifactId>
         <version>${springfox.version}</version>
       </dependency>
       <dependency>
@@ -190,6 +186,11 @@
         <artifactId>gson</artifactId>
         <version>${immutables.version}</version>
       </dependency>
+      <dependency>
+	<groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+	<version>${guava.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>
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
+}
-- 
cgit 1.2.3-korg