From a6dcb0487d3efa67e73285623062d700c7ef9cfa Mon Sep 17 00:00:00 2001 From: ChrisC Date: Fri, 7 May 2021 12:38:57 +0200 Subject: [PATCH] Update vulnerable package dependencies Update version to 1.9.0 Update vulnerable packages Fix dependency conflicts Issue-ID: SDC-3572 Signed-off-by: ChrisC Change-Id: I2dfac9340555ff41bb8b977bd28d0ed861c19125 --- pom.xml | 2 +- sdc-workflow-designer-be/pom.xml | 78 +++++++++++++++++++--- .../sdc/workflow/api/swagger/UserIdReader.java | 2 +- .../sdc/workflow/server/config/SwaggerConfig.java | 2 - .../sdc/workflow/api/swagger/UserIdReaderTest.java | 6 +- sdc-workflow-designer-init/pom.xml | 2 +- sdc-workflow-designer-ui/pom.xml | 15 ++++- version.properties | 2 +- 8 files changed, 87 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index f6c1aef4..d0f448c3 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.onap.sdc.sdc-workflow-designer sdc-workflow-designer-parent sdc-sdc-workflow-designer - 1.8.0-SNAPSHOT + 1.9.0-SNAPSHOT pom diff --git a/sdc-workflow-designer-be/pom.xml b/sdc-workflow-designer-be/pom.xml index a25d2fbd..e7be72bf 100644 --- a/sdc-workflow-designer-be/pom.xml +++ b/sdc-workflow-designer-be/pom.xml @@ -10,14 +10,14 @@ org.onap.sdc.sdc-workflow-designer sdc-workflow-designer-parent - 1.8.0-SNAPSHOT + 1.9.0-SNAPSHOT - 2.1.0.RELEASE + 2.3.10.RELEASE 1.3.1.Final 1.18.0 - 2.8.0 + 3.0.0 2.3.0 @@ -48,9 +48,35 @@ org.springframework.boot spring-boot-starter-jetty + + org.springframework.boot + spring-boot-starter-validation + org.springframework.boot spring-boot-starter-data-cassandra + + + HdrHistogram + org.hdrhistogram + + + asm + org.ow2.asm + + + asm-analysis + org.ow2.asm + + + asm-commons + org.ow2.asm + + + asm-tree + org.ow2.asm + + org.springframework.boot @@ -61,15 +87,16 @@ org.springframework.boot spring-boot-starter-test test + + + asm + org.ow2.asm + + io.springfox - springfox-swagger-ui - ${springfox.version} - - - io.springfox - springfox-swagger2 + springfox-boot-starter ${springfox.version} @@ -96,6 +123,13 @@ org.apache.httpcomponents httpclient + 4.5.13 + + + commons-codec + commons-codec + + org.mapstruct @@ -127,17 +161,23 @@ commons-io commons-io - 2.6 + 2.8.0 commons-codec commons-codec - 1.9 + 1.15 org.onap.sdc.sdc-be-common session-lib 1.6.0 + + + objenesis + org.objenesis + + org.onap.sdc.sdc-be-common @@ -159,6 +199,22 @@ org.springframework.boot spring-boot-starter-data-cassandra + + jnr-posix + com.github.jnr + + + jnr-ffi + com.github.jnr + + + zusammen-sdk + com.amdocs.zusammen + + + zusammen-commons-configuration + com.amdocs.zusammen + 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); diff --git a/sdc-workflow-designer-init/pom.xml b/sdc-workflow-designer-init/pom.xml index a665e1a5..178a2dd6 100644 --- a/sdc-workflow-designer-init/pom.xml +++ b/sdc-workflow-designer-init/pom.xml @@ -10,7 +10,7 @@ org.onap.sdc.sdc-workflow-designer sdc-workflow-designer-parent - 1.8.0-SNAPSHOT + 1.9.0-SNAPSHOT diff --git a/sdc-workflow-designer-ui/pom.xml b/sdc-workflow-designer-ui/pom.xml index 887267b4..4cfc8d15 100644 --- a/sdc-workflow-designer-ui/pom.xml +++ b/sdc-workflow-designer-ui/pom.xml @@ -27,7 +27,7 @@ org.onap.sdc.sdc-workflow-designer sdc-workflow-designer-parent - 1.8.0-SNAPSHOT + 1.9.0-SNAPSHOT @@ -39,7 +39,13 @@ org.eclipse.jetty jetty-proxy - 9.4.18.v20190429 + 9.4.40.v20210413 + + + jetty-http + org.eclipse.jetty + + javax.servlet @@ -47,6 +53,11 @@ 3.0.1 provided + + org.eclipse.jetty + jetty-http + 9.4.40.v20210413 + diff --git a/version.properties b/version.properties index 11f03832..0986d1f0 100644 --- a/version.properties +++ b/version.properties @@ -3,7 +3,7 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=8 +minor=9 patch=0 base_version=${major}.${minor}.${patch} -- 2.16.6