From 1d2daa763efd7c1fb55c85f040b152fe68d1d1a1 Mon Sep 17 00:00:00 2001 From: Kai Date: Thu, 18 Feb 2021 14:14:04 +0800 Subject: Vulnerability removal for TCAgen2 Issue-ID: DCAEGEN2-2590 Signed-off-by: Kai Lu Change-Id: I9463568c694255a1eab418051d05083e01a7cb95 --- dcae-analytics/dcae-analytics-model/pom.xml | 112 ++++++------ dcae-analytics/dcae-analytics-tca-core/pom.xml | 2 +- dcae-analytics/dcae-analytics-tca-model/pom.xml | 2 +- dcae-analytics/dcae-analytics-tca-web/pom.xml | 2 +- dcae-analytics/dcae-analytics-test/pom.xml | 2 +- dcae-analytics/dcae-analytics-web/pom.xml | 2 +- dcae-analytics/pom.xml | 220 ++++++++++++------------ dcae-analytics/version.properties | 2 +- 8 files changed, 175 insertions(+), 169 deletions(-) (limited to 'dcae-analytics') diff --git a/dcae-analytics/dcae-analytics-model/pom.xml b/dcae-analytics/dcae-analytics-model/pom.xml index 28d2180..90a9b35 100644 --- a/dcae-analytics/dcae-analytics-model/pom.xml +++ b/dcae-analytics/dcae-analytics-model/pom.xml @@ -19,30 +19,31 @@ --> + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.onap.dcaegen2.analytics.tca-gen2 dcae-analytics - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT dcae-analytics-model jar - + DCAE Analytics Model Contains models (e.g. Common Event Format) which are common to DCAE Analytics - - ${project.parent.basedir} - 1.3.3 - 2.7.1 - + + ${project.parent.basedir} + 1.5.0 + 2.7.1 + @@ -62,8 +63,8 @@ jackson-core - com.fasterxml.jackson.dataformat - jackson-dataformat-smile + com.fasterxml.jackson.dataformat + jackson-dataformat-smile @@ -85,48 +86,51 @@ dcae-analytics-test - - org.onap.dcaegen2.services.sdk.rest.services - cbs-client - ${sdk.version} - - - org.onap.dcaegen2.services.sdk.rest.services - dmaap-client - ${sdk.version} - - - org.springframework - spring-beans - - - org.springframework - spring-context - - - org.springframework - spring-webflux - - - org.springframework.boot - spring-boot-autoconfigure - - - javax.validation - validation-api - - - org.immutables - value - ${immutable.version} - provided + + org.onap.dcaegen2.services.sdk.rest.services + cbs-client + ${sdk.version} - - - org.onap.dcaegen2.analytics.tca-gen2 - eelf-logger-logback-impl - - - + + org.onap.dcaegen2.services.sdk.rest.services + dmaap-client + ${sdk.version} + + + io.projectreactor.netty + reactor-netty + 0.9.12.RELEASE + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-webflux + + + org.springframework.boot + spring-boot-autoconfigure + + + javax.validation + validation-api + + + org.immutables + value + ${immutable.version} + provided + + + org.onap.dcaegen2.analytics.tca-gen2 + eelf-logger-logback-impl + + diff --git a/dcae-analytics/dcae-analytics-tca-core/pom.xml b/dcae-analytics/dcae-analytics-tca-core/pom.xml index 9c2b308..09d90e1 100644 --- a/dcae-analytics/dcae-analytics-tca-core/pom.xml +++ b/dcae-analytics/dcae-analytics-tca-core/pom.xml @@ -27,7 +27,7 @@ org.onap.dcaegen2.analytics.tca-gen2 dcae-analytics - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT dcae-analytics-tca-core diff --git a/dcae-analytics/dcae-analytics-tca-model/pom.xml b/dcae-analytics/dcae-analytics-tca-model/pom.xml index b9c820a..a24c3fd 100644 --- a/dcae-analytics/dcae-analytics-tca-model/pom.xml +++ b/dcae-analytics/dcae-analytics-tca-model/pom.xml @@ -27,7 +27,7 @@ org.onap.dcaegen2.analytics.tca-gen2 dcae-analytics - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT dcae-analytics-tca-model diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml index 1d9a89a..fdee04e 100644 --- a/dcae-analytics/dcae-analytics-tca-web/pom.xml +++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml @@ -29,7 +29,7 @@ org.onap.dcaegen2.analytics.tca-gen2 dcae-analytics - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT dcae-analytics-tca-web diff --git a/dcae-analytics/dcae-analytics-test/pom.xml b/dcae-analytics/dcae-analytics-test/pom.xml index 6530e5c..c705e15 100644 --- a/dcae-analytics/dcae-analytics-test/pom.xml +++ b/dcae-analytics/dcae-analytics-test/pom.xml @@ -27,7 +27,7 @@ org.onap.dcaegen2.analytics.tca-gen2 dcae-analytics - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT dcae-analytics-test diff --git a/dcae-analytics/dcae-analytics-web/pom.xml b/dcae-analytics/dcae-analytics-web/pom.xml index e6f7237..c0a20ce 100644 --- a/dcae-analytics/dcae-analytics-web/pom.xml +++ b/dcae-analytics/dcae-analytics-web/pom.xml @@ -27,7 +27,7 @@ org.onap.dcaegen2.analytics.tca-gen2 dcae-analytics - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT dcae-analytics-web diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml index 5a6311e..7f8d169 100644 --- a/dcae-analytics/pom.xml +++ b/dcae-analytics/pom.xml @@ -19,16 +19,16 @@ --> + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.onap.dcaegen2.analytics.tca-gen2 - tca-gen2-parent - 1.2.1-SNAPSHOT - + + org.onap.dcaegen2.analytics.tca-gen2 + tca-gen2-parent + 1.2.2-SNAPSHOT + dcae-analytics pom @@ -48,7 +48,7 @@ - + UTF-8 UTF-8 ${project.basedir} @@ -59,7 +59,7 @@ Finchley.RC2 5.0.11.RELEASE 1.4 - 2.9.2 + 3.0.0 3.0.2 3.0.1 @@ -87,7 +87,7 @@ 1.18.0.0 2.2.3 3.0.0 - 1.0.0 + 1.0.0 11 @@ -109,9 +109,8 @@ content/repositories/releases/ nexus3.onap.org:10003 2.11.0 - 2.0.27 + 2.2.2.Final 5.2.7.RELEASE - 2.10.5 @@ -224,18 +233,18 @@ ${junit-jupiter.version} test - - junit - junit - 4.13 - test - - - org.junit.vintage - junit-vintage-engine - 5.6.2 - test - + + junit + junit + 4.13 + test + + + org.junit.vintage + junit-vintage-engine + 5.6.2 + test + org.junit.platform junit-platform-engine @@ -260,40 +269,40 @@ org.springframework.boot spring-boot-dependencies ${spring.boot.version} - - - org.springframework - spring-web - - - org.springframework.boot - spring-boot-starter-test - - - org.mockito - mockito-core - - - io.undertow - undertow-core - - - org.springframework - spring-webflux - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - - + + + org.springframework + spring-web + + + org.springframework.boot + spring-boot-starter-test + + + org.mockito + mockito-core + + + io.undertow + undertow-core + + + org.springframework + spring-webflux + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + + pom import @@ -305,46 +314,46 @@ pom import - - org.springframework - spring-webflux - ${spring-webflux.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework.boot - spring-boot-starter-test - 2.2.0.RELEASE - - + + org.springframework + spring-webflux + ${spring-webflux.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework.boot + spring-boot-starter-test + 2.2.0.RELEASE + + org.mockito mockito-core 2.23.4 - - - io.undertow - undertow-core - 2.0.27.Final - - - com.fasterxml.jackson.core - jackson-databind + + + io.undertow + undertow-core + ${undertow.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile ${jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - ${jackson.version} - @@ -435,7 +444,8 @@ ${maven-surefire-plugin.version} ${skip.unit.tests} - -Xmx2048m -Djava.awt.headless=true -XX:+UseConcMarkSweepGC + -Xmx2048m -Djava.awt.headless=true + -XX:+UseConcMarkSweepGC -XX:OnOutOfMemoryError="kill -9 %p" -XX:+HeapDumpOnOutOfMemoryError ${surefireArgLine} ${surefire.redirectTestOutputToFile} @@ -542,7 +552,7 @@ validate validate - true + true ${checkstyle.file.name} ${checkstyle.suppression.file.name} UTF-8 @@ -677,17 +687,9 @@ - + @@ -736,10 +738,10 @@ maven-pmd-plugin - + org.apache.maven.plugins maven-checkstyle-plugin - + org.jacoco diff --git a/dcae-analytics/version.properties b/dcae-analytics/version.properties index e2869cd..d67f858 100644 --- a/dcae-analytics/version.properties +++ b/dcae-analytics/version.properties @@ -18,7 +18,7 @@ # major=1 minor=2 -patch=1 +patch=2 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg