Update vulnerable package dependencies

Update version to 1.9.0
Update vulnerable packages
Fix dependency conflicts

Issue-ID: SDC-3572
Signed-off-by: ChrisC <christophe.closset@intl.att.com>
Change-Id: I2dfac9340555ff41bb8b977bd28d0ed861c19125

3 files changed, 4 insertions, 6 deletions

diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/swagger/UserIdReader.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/swagger/UserIdReader.java
index d16c9407..0bcac29f 100644
--- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/swagger/UserIdReader.java
+++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/api/swagger/UserIdReader.java
@@ -19,7 +19,7 @@ package org.onap.sdc.workflow.api.swagger;
 import static org.onap.sdc.workflow.api.RestParams.USER_ID_HEADER;
 
 import com.fasterxml.classmate.TypeResolver;
-import com.google.common.base.Optional;
+import java.util.Optional;
 import org.onap.sdc.workflow.services.annotations.UserId;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
diff --git a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/SwaggerConfig.java b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/SwaggerConfig.java
index a2eca63a..d6f2e3e1 100644
--- a/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/SwaggerConfig.java
+++ b/sdc-workflow-designer-be/src/main/java/org/onap/sdc/workflow/server/config/SwaggerConfig.java
@@ -23,10 +23,8 @@ import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @Configuration
-@EnableSwagger2
 public class SwaggerConfig {
 
     @Bean
diff --git a/sdc-workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/swagger/UserIdReaderTest.java b/sdc-workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/swagger/UserIdReaderTest.java
index 6899e984..b82cb438 100644
--- a/sdc-workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/swagger/UserIdReaderTest.java
+++ b/sdc-workflow-designer-be/src/test/java/org/onap/sdc/workflow/api/swagger/UserIdReaderTest.java
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.fasterxml.classmate.TypeResolver;
-import com.google.common.base.Optional;
+import java.util.Optional;
 import java.lang.annotation.Annotation;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,7 +60,7 @@ public class UserIdReaderTest {
     @Test
     public void shouldNotCallToParameterBuilderIfUserIdAnnotationNotFound() {
         when(parameterContext.resolvedMethodParameter()).thenReturn(resolvedMethodParameter);
-        when(resolvedMethodParameter.findAnnotation(UserId.class)).thenReturn(Optional.absent());
+        when(resolvedMethodParameter.findAnnotation(UserId.class)).thenReturn(Optional.empty());
         userIdReader.apply(parameterContext);
         verify(parameterContext, times(0)).parameterBuilder();
     }
@@ -70,7 +70,7 @@ public class UserIdReaderTest {
 
         doReturn(resolvedMethodParameter).when(parameterContext).resolvedMethodParameter();
         doReturn(parameterBuilder).when(parameterContext).parameterBuilder();
-        doReturn(parameterBuilder).when(parameterBuilder).parameterType(any());
+        doReturn(parameterBuilder).when(parameterBuilder).parameterType((String)(any()));
         doReturn(parameterBuilder).when(parameterBuilder).name(any());
         doReturn(parameterBuilder).when(parameterBuilder).type(any());
         doReturn(Optional.of(USER_ID_ANNOTATION)).when(resolvedMethodParameter).findAnnotation(UserId.class);