X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=caeebec1172935c11497a691c54d47764769acb0;hb=refs%2Ftags%2F1.4.0;hp=780147c4048471d494216ab05d8e4de04249d1c4;hpb=dc47bd1847a46fe0ad0ca6c10a4d61f829f4c0c6;p=dcaegen2%2Fcollectors%2Fhv-ves.git

diff --git a/pom.xml b/pom.xml
index 780147c4..caeebec1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,13 +33,13 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.2.1</version>
+        <version>2.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.4.0-SNAPSHOT</version>
     <name>dcaegen2-collectors-veshv</name>
     <description>VES HighVolume Collector</description>
     <packaging>pom</packaging>
@@ -50,13 +50,14 @@
     </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>
+        <detekt.version>1.0.0-RC14</detekt.version>
+        <sdk.version>1.3.4</sdk.version>
 
         <!-- Protocol buffers -->
         <protobuf.version>3.6.1</protobuf.version>
@@ -65,6 +66,7 @@
         <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>
@@ -79,7 +81,7 @@
         <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>1.2-SNAPSHOT</docker-image.latest>
         <docker.http_proxy/>
     </properties>
 
@@ -104,9 +106,6 @@
                 <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>
@@ -120,7 +119,7 @@
                     <groupId>org.jetbrains.kotlin</groupId>
                     <version>${kotlin.version}</version>
                     <configuration>
-                        <jvmTarget>1.8</jvmTarget>
+                        <jvmTarget>11</jvmTarget>
                     </configuration>
                     <executions>
                         <execution>
@@ -153,8 +152,8 @@
                     <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>
@@ -315,7 +314,7 @@
                         <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>
@@ -397,7 +396,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-
+                <version>27.0.1-jre</version>
                 <exclusions>
                     <exclusion>
                         <groupId>com.google.code.findbugs</groupId>
@@ -407,13 +406,10 @@
             </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>
@@ -422,9 +418,8 @@
             </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>
@@ -435,51 +430,36 @@
             <dependency>
                 <groupId>org.jetbrains.kotlinx</groupId>
                 <artifactId>kotlinx-coroutines-core</artifactId>
-                <version>1.0.0</version>
+                <version>${coroutines.version}</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>
-            </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>
@@ -497,22 +477,20 @@
                 <groupId>io.projectreactor</groupId>
                 <artifactId>reactor-bom</artifactId>
                 <!-- remember to update netty native bindings versions -->
-                <version>Californium-SR2</version>
+                <version>Dysprosium-SR1</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>
@@ -525,6 +503,12 @@
                 <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>
@@ -541,22 +525,10 @@
                 <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>
@@ -574,6 +546,16 @@
                 <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 -->
 
@@ -598,7 +580,7 @@
             <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>
@@ -613,6 +595,12 @@
                 <version>3.1.7.RELEASE</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-test</artifactId>
+                <version>${coroutines.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>