<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.2.1</version>
+ <version>3.0.0</version>
<relativePath/>
</parent>
<groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
<artifactId>ves-hv-collector</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<name>dcaegen2-collectors-veshv</name>
<description>VES HighVolume Collector</description>
<packaging>pom</packaging>
</modules>
<properties>
- <kotlin.version>1.3.11</kotlin.version>
- <arrow.version>0.8.0</arrow.version>
+ <coroutines.version>1.3.0-M2</coroutines.version>
+ <kotlin.version>1.3.31</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>
- <jacoco.version>0.8.2</jacoco.version>
- <detekt.version>1.0.0-RC11</detekt.version>
- <sdk.version>1.1.2-SNAPSHOT</sdk.version>
+ <jacoco.version>0.8.3</jacoco.version>
+ <detekt.version>1.0.0-RC14</detekt.version>
+ <sdk.version>1.5.0</sdk.version>
<!-- Protocol buffers -->
- <protobuf.version>3.6.1</protobuf.version>
+ <protobuf.version>3.14.0</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>
<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>
<failIfMissingUnitTests>false</failIfMissingUnitTests>
<failIfMissingComponentTests>false</failIfMissingComponentTests>
<skipAnalysis>true</skipAnalysis>
<jacoco.minimum.coverage>60</jacoco.minimum.coverage>
<skipEnforcer>true</skipEnforcer>
+ <!--Specify path to load jacoco xml report, as Sonar can't load Kotlin coverage from binary report. -->
+ <sonar.coverage.jacoco.xmlReportPaths>
+ ${project.basedir}/../../build/hv-collector-coverage/target/site/jacoco-aggregate/jacoco.xml
+ </sonar.coverage.jacoco.xmlReportPaths>
<!-- Docker -->
<skipDocker>false</skipDocker>
<docker-image.registry>${onap.nexus.dockerregistry.daily}</docker-image.registry>
<docker-image.namespace>onap</docker-image.namespace>
<docker-image.name>${project.groupId}.${project.artifactId}</docker-image.name>
- <docker-image.latest>1.1-SNAPSHOT</docker-image.latest>
+ <docker-image.latest>latest-honolulu</docker-image.latest>
<docker.http_proxy/>
</properties>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version>
<configuration>
- <jvmTarget>1.8</jvmTarget>
+ <jvmTarget>11</jvmTarget>
</configuration>
<executions>
<execution>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
- <source>8</source>
- <target>8</target>
+ <source>11</source>
+ <target>11</target>
<encoding>UTF-8</encoding>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.26.0</version>
+ <version>0.30.0</version>
<executions>
<execution>
<id>docker-build-image</id>
<images>
<image>
<alias>${project.artifactId}</alias>
- <name>${docker-image.namespace}/${docker-image.name}
+ <name>${docker-image.namespace}/${docker-image.name}:${project.version}
</name>
<registry>${docker-image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}</dockerFileDir>
<tags>
<tag>${project.version}-${maven.build.timestamp}Z</tag>
- <tag>${project.version}</tag>
<tag>${docker-image.latest}</tag>
</tags>
</build>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
-
+ <version>27.0.1-jre</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-jdk8</artifactId>
- <version>${kotlin.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-reflect</artifactId>
+ <artifactId>kotlin-bom</artifactId>
<version>${kotlin.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-script-runtime</artifactId>
+ <artifactId>kotlin-scripting-compiler-embeddable</artifactId>
<version>${kotlin.version}</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-core</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>io.arrow-kt</groupId>
- <artifactId>arrow-core</artifactId>
- <version>${arrow.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-jdk7</artifactId>
- </exclusion>
- </exclusions>
+ <version>${coroutines.version}</version>
</dependency>
<dependency>
- <groupId>io.arrow-kt</groupId>
- <artifactId>arrow-syntax</artifactId>
- <version>${arrow.version}</version>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
</dependency>
<dependency>
<groupId>io.arrow-kt</groupId>
- <artifactId>arrow-instances-core</artifactId>
+ <artifactId>arrow-core-data</artifactId>
<version>${arrow.version}</version>
</dependency>
<dependency>
<groupId>io.arrow-kt</groupId>
- <artifactId>arrow-instances-data</artifactId>
+ <artifactId>arrow-core-extensions</artifactId>
<version>${arrow.version}</version>
</dependency>
<dependency>
<groupId>io.arrow-kt</groupId>
- <artifactId>arrow-effects</artifactId>
+ <artifactId>arrow-extras-data</artifactId>
<version>${arrow.version}</version>
</dependency>
<dependency>
<groupId>io.arrow-kt</groupId>
- <artifactId>arrow-effects-instances</artifactId>
+ <artifactId>arrow-syntax</artifactId>
<version>${arrow.version}</version>
</dependency>
<dependency>
<groupId>io.arrow-kt</groupId>
- <artifactId>arrow-effects-reactor</artifactId>
+ <artifactId>arrow-typeclasses</artifactId>
<version>${arrow.version}</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-bom</artifactId>
<!-- remember to update netty native bindings versions -->
- <version>Californium-SR2</version>
+ <version>2020.0.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
-
+ <!-- Due to security reasons, override transitive kafka-clients dependency version (2.0.0 -> 2.3.1) -->
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>2.3.1</version>
+ </dependency>
<!--
- Disable native extensions (ssl and epoll) on production for now.
+ Disable native extension (epoll) on production for now.
Might be reintroduced if performance tests prove there is some performance issue.
-->
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>2.0.15.Final</version>
- <scope>runtime</scope>
- <classifier>${os.detected.classifier}</classifier>
- </dependency>
<!--
<dependency>
<groupId>io.netty</groupId>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>${protobuf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>javax.json</artifactId>
<version>1.1.2</version>
</dependency>
- <dependency>
- <!-- To override ratpack transitive dependency which creates security vulnerability
- This issue will be resolved with ratpack 1.6.0 release -->
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.9.6</version>
- </dependency>
- <dependency>
- <groupId>io.ratpack</groupId>
- <artifactId>ratpack-core</artifactId>
- <version>1.5.4</version>
- </dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
- <version>1.0.8</version>
+ <version>1.1.5</version>
</dependency>
<dependency>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>hvvesclient-protobuf</artifactId>
<version>${sdk.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.onap.dcaegen2.services.sdk.security</groupId>
+ <artifactId>ssl</artifactId>
+ <version>${sdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
+ <artifactId>cbs-client</artifactId>
+ <version>${sdk.version}</version>
+ </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>com.nhaarman.mockitokotlin2</groupId>
<artifactId>mockito-kotlin</artifactId>
- <version>2.0.0</version>
+ <version>2.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>io.projectreactor</groupId>
- <artifactId>reactor-test</artifactId>
- <version>3.1.7.RELEASE</version>
+ <groupId>org.jetbrains.kotlinx</groupId>
+ <artifactId>kotlinx-coroutines-test</artifactId>
+ <version>${coroutines.version}</version>
<scope>test</scope>
</dependency>
</dependencies>