From 4143a769506bd5752e7ce7720c5a8e768b6621a0 Mon Sep 17 00:00:00 2001 From: Tomasz Pietruszkiewicz Date: Thu, 25 Mar 2021 11:54:14 +0100 Subject: Update all HV-VES dependencies to newest versions Change-Id: Iba0d2dce0374a3fe44f0b6e3b302b02e782d8d56 Issue-ID: DCAEGEN2-2696 Signed-off-by: Tomasz Pietruszkiewicz --- Changelog.md | 3 + build/hv-collector-analysis/pom.xml | 2 +- .../src/main/resources/onap-detekt-config.yml | 113 +++++++++------------ build/hv-collector-coverage/pom.xml | 2 +- build/pom.xml | 2 +- pom.xml | 87 ++++++++++------ sources/hv-collector-commandline/pom.xml | 2 +- sources/hv-collector-configuration/pom.xml | 2 +- .../config/impl/ConfigurationTransformerTest.kt | 1 + .../config/impl/ConfigurationValidatorTest.kt | 1 + sources/hv-collector-core/pom.xml | 2 +- sources/hv-collector-ct/pom.xml | 2 +- sources/hv-collector-dcae-app-simulator/pom.xml | 2 +- sources/hv-collector-domain/pom.xml | 2 +- sources/hv-collector-health-check/pom.xml | 2 +- sources/hv-collector-kafka-consumer/pom.xml | 2 +- sources/hv-collector-kafka/pom.xml | 2 +- sources/hv-collector-main/pom.xml | 2 +- sources/hv-collector-server/pom.xml | 2 +- sources/hv-collector-ssl/pom.xml | 2 +- sources/hv-collector-test-utils/pom.xml | 2 +- sources/hv-collector-utils/pom.xml | 2 +- sources/hv-collector-ves-message-generator/pom.xml | 2 +- .../generator/impl/MessageParametersParserTest.kt | 1 + sources/hv-collector-xnf-simulator/pom.xml | 2 +- sources/pom.xml | 15 +-- tools/development/docker-compose.yml | 8 +- version.properties | 2 +- 28 files changed, 141 insertions(+), 128 deletions(-) diff --git a/Changelog.md b/Changelog.md index 294ead0b..5931e540 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,5 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.7.0] - 29/03/2021 + - [DCAEGEN2-2696](https://jira.onap.org/browse/DCAEGEN2-2696) - Update all HV-VES dependencies to newest versions + ## [1.6.0] - 17/12/2020 - [DCAEGEN2-2537](https://jira.onap.org/browse/DCAEGEN2-2537) - Upgrade Reactor and SpringBoot in DFC, PM-Mapper, BBS \ No newline at end of file diff --git a/build/hv-collector-analysis/pom.xml b/build/hv-collector-analysis/pom.xml index 4517ba66..618667ff 100644 --- a/build/hv-collector-analysis/pom.xml +++ b/build/hv-collector-analysis/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-build - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/build/hv-collector-analysis/src/main/resources/onap-detekt-config.yml b/build/hv-collector-analysis/src/main/resources/onap-detekt-config.yml index a5dd275e..baab749a 100644 --- a/build/hv-collector-analysis/src/main/resources/onap-detekt-config.yml +++ b/build/hv-collector-analysis/src/main/resources/onap-detekt-config.yml @@ -1,32 +1,12 @@ -autoCorrect: true -failFast: false -test-pattern: # Configure exclusions for test sources - active: true - patterns: # Test file regexes - - '.*/test/.*' - - '.*Test.kt' - - '.*Spec.kt' - exclude-rule-sets: - - 'comments' - exclude-rules: - - 'NamingRules' - - 'WildcardImport' - - 'MagicNumber' - - 'MaxLineLength' - - 'LateinitUsage' - - 'StringLiteralDuplication' - - 'SpreadOperator' - - 'TooManyFunctions' - - 'ForEachOnRange' build: maxIssues: 3 weights: - # complexity: 2 - # LongParameterList: 1 - # style: 1 - # comments: 1 + # complexity: 2 + # LongParameterList: 1 + # style: 1 + # comments: 1 processors: active: true @@ -94,7 +74,8 @@ complexity: threshold: 20 LongParameterList: active: true - threshold: 6 + functionThreshold: 6 + constructorThreshold: 7 ignoreDefaultParameters: false MethodOverloading: active: false @@ -137,7 +118,7 @@ empty-blocks: active: true EmptyFunctionBlock: active: true - ignoreOverriddenFunctions: false + ignoreOverridden: false EmptyIfBlock: active: true EmptyInitBlock: @@ -180,43 +161,43 @@ exceptions: TooGenericExceptionCaught: active: true exceptionNames: - - ArrayIndexOutOfBoundsException - - Error - - Exception - - IllegalMonitorStateException - - NullPointerException - - IndexOutOfBoundsException - - RuntimeException - - Throwable + - ArrayIndexOutOfBoundsException + - Error + - Exception + - IllegalMonitorStateException + - NullPointerException + - IndexOutOfBoundsException + - RuntimeException + - Throwable TooGenericExceptionThrown: active: true exceptionNames: - - Error - - Exception - - Throwable - - RuntimeException + - Error + - Exception + - Throwable + - RuntimeException formatting: active: true android: false - autoCorrect: true + ChainWrapping: active: false - autoCorrect: true + CommentSpacing: active: true - autoCorrect: true + Filename: active: true FinalNewline: active: true - autoCorrect: true + ImportOrdering: active: true - autoCorrect: true + Indentation: active: true - autoCorrect: true + indentSize: 4 continuationIndentSize: 4 MaximumLineLength: @@ -224,67 +205,65 @@ formatting: maxLineLength: 120 ModifierOrdering: active: true - autoCorrect: true + NoBlankLineBeforeRbrace: active: true - autoCorrect: true + NoConsecutiveBlankLines: active: true - autoCorrect: true + NoEmptyClassBody: active: true - autoCorrect: true - NoItParamInMultilineLambda: - active: true + NoLineBreakAfterElse: active: true - autoCorrect: true + NoLineBreakBeforeAssignment: active: true - autoCorrect: true + NoMultipleSpaces: active: true - autoCorrect: true + NoSemicolons: active: true - autoCorrect: true + NoTrailingSpaces: active: true - autoCorrect: true + NoUnitReturn: active: true - autoCorrect: true + NoUnusedImports: active: true - autoCorrect: true + NoWildcardImports: active: true - autoCorrect: true + ParameterListWrapping: active: false - autoCorrect: true + indentSize: 4 SpacingAroundColon: active: true - autoCorrect: true + SpacingAroundComma: active: true - autoCorrect: true + SpacingAroundCurly: active: true - autoCorrect: true + SpacingAroundKeyword: active: true - autoCorrect: true + SpacingAroundOperators: active: true - autoCorrect: true + SpacingAroundRangeOperator: active: true - autoCorrect: true + StringTemplate: active: true - autoCorrect: true + naming: active: true @@ -311,7 +290,7 @@ naming: active: false MemberNameEqualsClassName: active: false - ignoreOverriddenFunction: true + ignoreOverridden: true ObjectPropertyNaming: active: true propertyPattern: '[A-Za-z][_A-Za-z0-9]*' diff --git a/build/hv-collector-coverage/pom.xml b/build/hv-collector-coverage/pom.xml index 0de95e98..eb2c6c2f 100644 --- a/build/hv-collector-coverage/pom.xml +++ b/build/hv-collector-coverage/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-build - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/build/pom.xml b/build/pom.xml index f3248331..4b743efb 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -32,7 +32,7 @@ org.onap.dcaegen2.collectors.hv-ves ves-hv-collector - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 557e602e..6f47cca9 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ org.onap.dcaegen2.collectors.hv-ves ves-hv-collector - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT dcaegen2-collectors-veshv VES HighVolume Collector pom @@ -50,43 +50,44 @@ - 3.1.0 - 6.1.1 - 3.7 - 2.22.0 - 1.6.0 - 1.6.0 - 3.1.1 - 0.30.0 - 27.0.1-jre - 1.3.0-alpha4 - 1.8.0-beta1 - 2020.0.2 - 2.3.1 + 3.2.0 + 9.1 + 3.12.0 + 2.22.2 + 2.22.2 + 3.0.0 + 1.7.0 + 3.1.2 + 0.34.1 + 30.1.1-jre + 1.3.0-alpha5 + 2.0.0-alpha1 + 2020.0.5 + 2.7.0 1.4 - 1.1.2 - 1.1.2 - 1.1.5 - 3.9.1 - 2.1.0 - 1.3.0-M2 - 1.3.31 + 1.1.4 + 1.1.4 + 1.6.5 + 3.19.0 + 2.2.0 + 1.4.2 + 1.4.10 0.9.0 - 3.7.0 - 1.7 + 3.8.1 + 3.2.0 0.8.3 - 1.0.0-RC14 - 1.5.0 + 1.15.0 + 1.8.0 - 3.14.0 + 4.0.0-rc-2 - 1.2.0-RC1 - 5.2.0-RC1 + 1.2.0 + 5.8.0-M1 1.1.5 - 2.8.5 - 2.22.0 + 2.8.6 + false false true @@ -396,9 +397,35 @@ never + + kotlinx-repository + kotlinx-repository + https://dl.bintray.com/kotlin/kotlinx/ + + true + never + + + false + never + + + + kotlinx-repository + kotlinx-repository + https://dl.bintray.com/kotlin/kotlinx/ + + true + never + + + false + never + + 40_openecomp-release 40_openecomp-release diff --git a/sources/hv-collector-commandline/pom.xml b/sources/hv-collector-commandline/pom.xml index ceb1de48..0048337b 100644 --- a/sources/hv-collector-commandline/pom.xml +++ b/sources/hv-collector-commandline/pom.xml @@ -7,7 +7,7 @@ hv-collector-sources org.onap.dcaegen2.collectors.hv-ves - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT hv-collector-commandline diff --git a/sources/hv-collector-configuration/pom.xml b/sources/hv-collector-configuration/pom.xml index be74a0ed..41284421 100644 --- a/sources/hv-collector-configuration/pom.xml +++ b/sources/hv-collector-configuration/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT hv-collector-configuration diff --git a/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationTransformerTest.kt b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationTransformerTest.kt index 42919e4d..918d6723 100644 --- a/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationTransformerTest.kt +++ b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationTransformerTest.kt @@ -37,6 +37,7 @@ import org.onap.dcaegen2.services.sdk.model.streams.dmaap.KafkaSink import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys import java.io.File import java.time.Duration +import kotlin.test.fail internal object ConfigurationTransformerTest : Spek({ diff --git a/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidatorTest.kt b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidatorTest.kt index 26a9cc57..30b6da1f 100644 --- a/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidatorTest.kt +++ b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidatorTest.kt @@ -30,6 +30,7 @@ import org.jetbrains.spek.api.dsl.it import org.onap.dcae.collectors.veshv.config.api.model.ValidationException import org.onap.dcae.collectors.veshv.utils.logging.LogLevel import org.onap.dcaegen2.services.sdk.model.streams.dmaap.KafkaSink +import kotlin.test.fail internal object ConfigurationValidatorTest : Spek({ describe("ConfigurationValidator") { diff --git a/sources/hv-collector-core/pom.xml b/sources/hv-collector-core/pom.xml index 50c89182..0f1d2c3b 100644 --- a/sources/hv-collector-core/pom.xml +++ b/sources/hv-collector-core/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/sources/hv-collector-ct/pom.xml b/sources/hv-collector-ct/pom.xml index a17055df..b0737f85 100644 --- a/sources/hv-collector-ct/pom.xml +++ b/sources/hv-collector-ct/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/sources/hv-collector-dcae-app-simulator/pom.xml b/sources/hv-collector-dcae-app-simulator/pom.xml index 932ac73c..45771e4d 100644 --- a/sources/hv-collector-dcae-app-simulator/pom.xml +++ b/sources/hv-collector-dcae-app-simulator/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/sources/hv-collector-domain/pom.xml b/sources/hv-collector-domain/pom.xml index 55a6fb6f..635f2dfc 100644 --- a/sources/hv-collector-domain/pom.xml +++ b/sources/hv-collector-domain/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT hv-collector-domain diff --git a/sources/hv-collector-health-check/pom.xml b/sources/hv-collector-health-check/pom.xml index d420316e..f215d4c0 100644 --- a/sources/hv-collector-health-check/pom.xml +++ b/sources/hv-collector-health-check/pom.xml @@ -15,7 +15,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT hv-collector-health-check diff --git a/sources/hv-collector-kafka-consumer/pom.xml b/sources/hv-collector-kafka-consumer/pom.xml index 8cb34784..6b6f0251 100644 --- a/sources/hv-collector-kafka-consumer/pom.xml +++ b/sources/hv-collector-kafka-consumer/pom.xml @@ -15,7 +15,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/sources/hv-collector-kafka/pom.xml b/sources/hv-collector-kafka/pom.xml index a738bd16..67303ec3 100644 --- a/sources/hv-collector-kafka/pom.xml +++ b/sources/hv-collector-kafka/pom.xml @@ -15,7 +15,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/sources/hv-collector-main/pom.xml b/sources/hv-collector-main/pom.xml index f9d74c67..75d18728 100644 --- a/sources/hv-collector-main/pom.xml +++ b/sources/hv-collector-main/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT hv-collector-main diff --git a/sources/hv-collector-server/pom.xml b/sources/hv-collector-server/pom.xml index 6a4c60cb..bfc5cbb5 100644 --- a/sources/hv-collector-server/pom.xml +++ b/sources/hv-collector-server/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/sources/hv-collector-ssl/pom.xml b/sources/hv-collector-ssl/pom.xml index 0212c8d7..160d17da 100644 --- a/sources/hv-collector-ssl/pom.xml +++ b/sources/hv-collector-ssl/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/sources/hv-collector-test-utils/pom.xml b/sources/hv-collector-test-utils/pom.xml index 8e6a2fad..d1e75660 100644 --- a/sources/hv-collector-test-utils/pom.xml +++ b/sources/hv-collector-test-utils/pom.xml @@ -14,7 +14,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/sources/hv-collector-utils/pom.xml b/sources/hv-collector-utils/pom.xml index fcef0bfc..2718705e 100644 --- a/sources/hv-collector-utils/pom.xml +++ b/sources/hv-collector-utils/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/sources/hv-collector-ves-message-generator/pom.xml b/sources/hv-collector-ves-message-generator/pom.xml index 7cbc2d16..0fa7265a 100644 --- a/sources/hv-collector-ves-message-generator/pom.xml +++ b/sources/hv-collector-ves-message-generator/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserTest.kt b/sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserTest.kt index f34f153e..567631d5 100644 --- a/sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserTest.kt +++ b/sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserTest.kt @@ -33,6 +33,7 @@ import org.onap.dcae.collectors.veshv.ves.message.generator.api.VesEventParamete import org.onap.dcae.collectors.veshv.ves.message.generator.api.VesEventType.VALID import org.onap.dcae.collectors.veshv.ves.message.generator.api.WireFrameParameters import org.onap.dcae.collectors.veshv.ves.message.generator.api.WireFrameType.INVALID_GPB_DATA +import kotlin.test.fail /** diff --git a/sources/hv-collector-xnf-simulator/pom.xml b/sources/hv-collector-xnf-simulator/pom.xml index 0de7f3d7..73057dce 100644 --- a/sources/hv-collector-xnf-simulator/pom.xml +++ b/sources/hv-collector-xnf-simulator/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves hv-collector-sources - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/sources/pom.xml b/sources/pom.xml index 6914682b..9b227382 100644 --- a/sources/pom.xml +++ b/sources/pom.xml @@ -33,7 +33,7 @@ org.onap.dcaegen2.collectors.hv-ves ves-hv-collector - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. @@ -100,17 +100,18 @@ - + - - + @@ -125,7 +126,7 @@ ${project.groupId} hv-collector-analysis - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT diff --git a/tools/development/docker-compose.yml b/tools/development/docker-compose.yml index 7022eecb..1f655df2 100644 --- a/tools/development/docker-compose.yml +++ b/tools/development/docker-compose.yml @@ -89,7 +89,7 @@ services: # ves-hv-collector: - image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest + image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.7.0-SNAPSHOT ports: - "6060:6060" - "6061:6061/tcp" @@ -112,7 +112,7 @@ services: volumes: - ./configuration/:/etc/ves-hv/configuration/ - ../ssl/:/etc/ves-hv/ssl/ - - ./logs:/var/log/ONAP/dcae-hv-ves-collector + - ./logs:/var/log/ONAP/dcae-hv-ves-collector/ # @@ -120,7 +120,7 @@ services: # xnf-simulator: - image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator + image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator:1.7.0-SNAPSHOT ports: - "6062:6062/tcp" - "6063:6063" @@ -144,7 +144,7 @@ services: - ../ssl/:/etc/ves-hv/ dcae-app-simulator: - image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator + image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator:1.7.0-SNAPSHOT ports: - "6064:6064/tcp" command: ["--listen-port", "6064", diff --git a/version.properties b/version.properties index eabef1f2..24828c2f 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ major=1 -minor=6 +minor=7 patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} -- cgit 1.2.3-korg