Update all HV-VES dependencies to newest versions

Change-Id: Iba0d2dce0374a3fe44f0b6e3b302b02e782d8d56
Issue-ID: DCAEGEN2-2696
Signed-off-by: Tomasz Pietruszkiewicz <tomasz.pietruszkiewicz@nokia.com>

diff --git a/Changelog.md b/Changelog.md
index 294ead0..5931e54 100644 (file)
--- 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 4517ba6..618667f 100644 (file)
--- a/build/hv-collector-analysis/pom.xml
+++ b/build/hv-collector-analysis/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-build</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

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 a5dd275..baab749 100644 (file)
--- 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 0de95e9..eb2c6c2 100644 (file)
--- a/build/hv-collector-coverage/pom.xml
+++ b/build/hv-collector-coverage/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-build</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/build/pom.xml b/build/pom.xml
index f324833..4b743ef 100644 (file)
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>ves-hv-collector</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 557e602..6f47cca 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 
     <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
     <artifactId>ves-hv-collector</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <name>dcaegen2-collectors-veshv</name>
     <description>VES HighVolume Collector</description>
     <packaging>pom</packaging>
@@ -50,43 +50,44 @@
     </modules>
 
     <properties>
-        <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
-        <asm.version>6.1.1</asm.version>
-        <commons-lang3.version>3.7</commons-lang3.version>
-        <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
-        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-        <os-maven-plugin.version>1.6.0</os-maven-plugin.version>
-        <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
-        <docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
-        <guava.version>27.0.1-jre</guava.version>
-        <logback-classic.version>1.3.0-alpha4</logback-classic.version>
-        <slf4j-api.version>1.8.0-beta1</slf4j-api.version>
-        <reactor-bom.version>2020.0.2</reactor-bom.version>
-        <kafka-clients.version>2.3.1</kafka-clients.version>
+        <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
+        <asm.version>9.1</asm.version>
+        <commons-lang3.version>3.12.0</commons-lang3.version>
+        <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+        <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
+        <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
+        <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
+        <docker-maven-plugin.version>0.34.1</docker-maven-plugin.version>
+        <guava.version>30.1.1-jre</guava.version>
+        <logback-classic.version>1.3.0-alpha5</logback-classic.version>
+        <slf4j-api.version>2.0.0-alpha1</slf4j-api.version>
+        <reactor-bom.version>2020.0.5</reactor-bom.version>
+        <kafka-clients.version>2.7.0</kafka-clients.version>
         <commons-cli.version>1.4</commons-cli.version>
-        <javax.json-api.version>1.1.2</javax.json-api.version>
-        <javax.json.version>1.1.2</javax.json.version>
-        <micrometer-registry-prometheus.version>1.1.5</micrometer-registry-prometheus.version>
-        <assertj-core.version>3.9.1</assertj-core.version>
-        <mockito-kotlin.version>2.1.0</mockito-kotlin.version>
-        <coroutines.version>1.3.0-M2</coroutines.version>
-        <kotlin.version>1.3.31</kotlin.version>
+        <javax.json-api.version>1.1.4</javax.json-api.version>
+        <javax.json.version>1.1.4</javax.json.version>
+        <micrometer-registry-prometheus.version>1.6.5</micrometer-registry-prometheus.version>
+        <assertj-core.version>3.19.0</assertj-core.version>
+        <mockito-kotlin.version>2.2.0</mockito-kotlin.version>
+        <coroutines.version>1.4.2</coroutines.version>
+        <kotlin.version>1.4.10</kotlin.version>
         <arrow.version>0.9.0</arrow.version>
-        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
-        <build-helper-maven-plugin.version>1.7</build-helper-maven-plugin.version>
+        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
         <jacoco.version>0.8.3</jacoco.version>
-        <detekt.version>1.0.0-RC14</detekt.version>
-        <sdk.version>1.5.0</sdk.version>
+        <detekt.version>1.15.0</detekt.version>
+        <sdk.version>1.8.0</sdk.version>
 
         <!-- Protocol buffers -->
-        <protobuf.version>3.14.0</protobuf.version>
+        <protobuf.version>4.0.0-rc-2</protobuf.version>
 
         <!-- Testing and code analysis -->
-        <junit-platform.version>1.2.0-RC1</junit-platform.version>
-        <junit-jupiter.version>5.2.0-RC1</junit-jupiter.version>
+        <junit-platform.version>1.2.0</junit-platform.version>
+        <junit-jupiter.version>5.8.0-M1</junit-jupiter.version>
         <spek.version>1.1.5</spek.version>
-        <gson.version>2.8.5</gson.version>
-        <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
+        <gson.version>2.8.6</gson.version>
+
         <failIfMissingUnitTests>false</failIfMissingUnitTests>
         <failIfMissingComponentTests>false</failIfMissingComponentTests>
         <skipAnalysis>true</skipAnalysis>
@@ -396,9 +397,35 @@
                 <updatePolicy>never</updatePolicy>
             </snapshots>
         </pluginRepository>
+        <pluginRepository>
+            <id>kotlinx-repository</id>
+            <name>kotlinx-repository</name>
+            <url>https://dl.bintray.com/kotlin/kotlinx/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+                <updatePolicy>never</updatePolicy>
+            </snapshots>
+        </pluginRepository>
     </pluginRepositories>
 
     <repositories>
+        <repository>
+            <id>kotlinx-repository</id>
+            <name>kotlinx-repository</name>
+            <url>https://dl.bintray.com/kotlin/kotlinx/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+                <updatePolicy>never</updatePolicy>
+            </snapshots>
+        </repository>
         <repository>
             <id>40_openecomp-release</id>
             <name>40_openecomp-release</name>

diff --git a/sources/hv-collector-commandline/pom.xml b/sources/hv-collector-commandline/pom.xml
index ceb1de4..0048337 100644 (file)
--- a/sources/hv-collector-commandline/pom.xml
+++ b/sources/hv-collector-commandline/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>hv-collector-sources</artifactId>
     <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>hv-collector-commandline</artifactId>

diff --git a/sources/hv-collector-configuration/pom.xml b/sources/hv-collector-configuration/pom.xml
index be74a0e..4128442 100644 (file)
--- a/sources/hv-collector-configuration/pom.xml
+++ b/sources/hv-collector-configuration/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hv-collector-configuration</artifactId>

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 42919e4..918d672 100644 (file)
--- 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 26a9cc5..30b6da1 100644 (file)
--- 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 50c8918..0f1d2c3 100644 (file)
--- a/sources/hv-collector-core/pom.xml
+++ b/sources/hv-collector-core/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-ct/pom.xml b/sources/hv-collector-ct/pom.xml
index a17055d..b0737f8 100644 (file)
--- a/sources/hv-collector-ct/pom.xml
+++ b/sources/hv-collector-ct/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-dcae-app-simulator/pom.xml b/sources/hv-collector-dcae-app-simulator/pom.xml
index 932ac73..45771e4 100644 (file)
--- a/sources/hv-collector-dcae-app-simulator/pom.xml
+++ b/sources/hv-collector-dcae-app-simulator/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-domain/pom.xml b/sources/hv-collector-domain/pom.xml
index 55a6fb6..635f2df 100644 (file)
--- a/sources/hv-collector-domain/pom.xml
+++ b/sources/hv-collector-domain/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hv-collector-domain</artifactId>

diff --git a/sources/hv-collector-health-check/pom.xml b/sources/hv-collector-health-check/pom.xml
index d420316..f215d4c 100644 (file)
--- a/sources/hv-collector-health-check/pom.xml
+++ b/sources/hv-collector-health-check/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hv-collector-health-check</artifactId>

diff --git a/sources/hv-collector-kafka-consumer/pom.xml b/sources/hv-collector-kafka-consumer/pom.xml
index 8cb3478..6b6f025 100644 (file)
--- a/sources/hv-collector-kafka-consumer/pom.xml
+++ b/sources/hv-collector-kafka-consumer/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
     <artifactId>hv-collector-sources</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/sources/hv-collector-kafka/pom.xml b/sources/hv-collector-kafka/pom.xml
index a738bd1..67303ec 100644 (file)
--- a/sources/hv-collector-kafka/pom.xml
+++ b/sources/hv-collector-kafka/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-main/pom.xml b/sources/hv-collector-main/pom.xml
index f9d74c6..75d1872 100644 (file)
--- a/sources/hv-collector-main/pom.xml
+++ b/sources/hv-collector-main/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hv-collector-main</artifactId>

diff --git a/sources/hv-collector-server/pom.xml b/sources/hv-collector-server/pom.xml
index 6a4c60c..bfc5cbb 100644 (file)
--- a/sources/hv-collector-server/pom.xml
+++ b/sources/hv-collector-server/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-ssl/pom.xml b/sources/hv-collector-ssl/pom.xml
index 0212c8d..160d17d 100644 (file)
--- a/sources/hv-collector-ssl/pom.xml
+++ b/sources/hv-collector-ssl/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-test-utils/pom.xml b/sources/hv-collector-test-utils/pom.xml
index 8e6a2fa..d1e7566 100644 (file)
--- a/sources/hv-collector-test-utils/pom.xml
+++ b/sources/hv-collector-test-utils/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-utils/pom.xml b/sources/hv-collector-utils/pom.xml
index fcef0bf..2718705 100644 (file)
--- a/sources/hv-collector-utils/pom.xml
+++ b/sources/hv-collector-utils/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/hv-collector-ves-message-generator/pom.xml b/sources/hv-collector-ves-message-generator/pom.xml
index 7cbc2d1..0fa7265 100644 (file)
--- a/sources/hv-collector-ves-message-generator/pom.xml
+++ b/sources/hv-collector-ves-message-generator/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

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 f34f153..567631d 100644 (file)
--- 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 0de7f3d..73057dc 100644 (file)
--- a/sources/hv-collector-xnf-simulator/pom.xml
+++ b/sources/hv-collector-xnf-simulator/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>hv-collector-sources</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/sources/pom.xml b/sources/pom.xml
index 6914682..9b22738 100644 (file)
--- a/sources/pom.xml
+++ b/sources/pom.xml
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
         <artifactId>ves-hv-collector</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -100,17 +100,18 @@
                                 </goals>
                                 <configuration>
                                     <target name="detekt" unless="${skipAnalysis}">
-                                        <java taskname="detekt" dir="${basedir}" fork="true" failonerror="true"
-                                                classname="io.gitlab.arturbosch.detekt.cli.Main"
-                                                classpathref="maven.plugin.classpath">
+                                        <java taskname="detekt" dir="${basedir}"
+                                              fork="true"
+                                              failonerror="true"
+                                              classname="io.gitlab.arturbosch.detekt.cli.Main"
+                                              classpathref="maven.plugin.classpath">
                                             <arg value="--input"/>
                                             <arg value="${basedir}/src/main/kotlin"/>
                                             <arg value="--config-resource"/>
                                             <arg value="onap-detekt-config.yml"/>
-                                            <arg value="--filters"/>
-                                            <arg value=".*/target/.*,.*/resources/.*"/>
                                             <arg value="--report"/>
                                             <arg value="html:${basedir}/target/detekt-report.html"/>
+                                            <arg value="--auto-correct"/>
                                         </java>
                                     </target>
                                 </configuration>
@@ -125,7 +126,7 @@
                             <dependency>
                                 <groupId>${project.groupId}</groupId>
                                 <artifactId>hv-collector-analysis</artifactId>
-                                <version>1.6.0-SNAPSHOT</version>
+                                <version>1.7.0-SNAPSHOT</version>
                             </dependency>
                         </dependencies>
                     </plugin>

diff --git a/tools/development/docker-compose.yml b/tools/development/docker-compose.yml
index 7022eec..1f655df 100644 (file)
--- 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 eabef1f..24828c2 100644 (file)
--- 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}