Update README.md

[dcaegen2/collectors/hv-ves.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 6bbcef3..ee0558a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,7 @@
   ~ limitations under the License.
   ~ ============LICENSE_END=========================================================
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,11 +32,11 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>0.1.1</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
-    <groupId>org.onap.dcaegen2.collectors.veshv</groupId>
+    <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId>
     <artifactId>ves-hv-collector</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <name>dcaegen2-collectors-veshv</name>
@@ -60,10 +59,12 @@
     </modules>
 
     <properties>
-        <kotlin.version>1.2.60</kotlin.version>
-        <arrow.version>0.7.2</arrow.version>
+        <kotlin.version>1.2.61</kotlin.version>
+        <arrow.version>0.7.3</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>
+        <jacoco.minimum.coverage>66</jacoco.minimum.coverage>
 
         <!-- Protocol buffers -->
         <protobuf.version>3.5.1</protobuf.version>
@@ -82,13 +83,14 @@
 
         <!-- Docker -->
         <skipDocker>false</skipDocker>
+        <skipDockerPush>true</skipDockerPush>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
         <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.http_proxy></docker.http_proxy>
-        <docker.https_proxy></docker.https_proxy>
-    </properties>
+        <docker.http_proxy/>
 
+    </properties>
 
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
@@ -121,6 +123,7 @@
                     <version>${kotlin.version}</version>
                     <configuration>
                         <jvmTarget>1.8</jvmTarget>
+                        <experimentalCoroutines>enable</experimentalCoroutines>
                     </configuration>
                     <executions>
                         <execution>
@@ -259,6 +262,11 @@
                         </dependency>
                     </dependencies>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>1.6.0</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -307,11 +315,7 @@
                         </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"/>
@@ -338,7 +342,7 @@
                     <dependency>
                         <groupId>${project.groupId}</groupId>
                         <artifactId>hv-collector-analysis</artifactId>
-                        <version>${project.version}</version>
+                        <version>1.0.0-SNAPSHOT</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -353,6 +357,20 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>docker-proxy</id>
+            <activation>
+                <property>
+                    <name>docker.http_proxy</name>
+                </property>
+            </activation>
+            <properties>
+                <!-- set build args as defined in https://dmp.fabric8.io/#build-buildargs -->
+                <docker.buildArg.http_proxy>${docker.http_proxy}</docker.buildArg.http_proxy>
+                <docker.buildArg.https_proxy>${docker.http_proxy}</docker.buildArg.https_proxy>
+            </properties>
+        </profile>
+
         <profile>
             <id>docker</id>
             <activation>
@@ -406,7 +424,7 @@
                             <executions>
                                 <execution>
                                     <id>docker-build-image</id>
-                                    <phase>deploy</phase>
+                                    <phase>package</phase>
                                     <goals>
                                         <goal>build</goal>
                                     </goals>
@@ -420,30 +438,33 @@
                                 </execution>
                             </executions>
                             <configuration>
+                                <skipPush>${skipDockerPush}</skipPush>
                                 <verbose>true</verbose>
                                 <imagePullPolicy>IfNotPresent</imagePullPolicy>
                                 <images>
                                     <image>
                                         <alias>${project.artifactId}</alias>
-                                        <name>${docker-image.registry}/${docker-image.namespace}/${docker-image.name}
+                                        <name>${docker-image.namespace}/${docker-image.name}
                                         </name>
-                                        <tags>
-                                            <tag>${project.version}-SNAPSHOT-${maven.build.timestamp}Z</tag>
-                                            <tag>${project.version}</tag>
-                                            <tag>latest</tag>
-                                        </tags>
+                                        <registry>${docker-image.registry}</registry>
                                         <build>
-                                            <!--
-                                            <args>
-                                                <http_proxy>${docker.http_proxy}</http_proxy>
-                                                <https_proxy>${docker.https_proxy}</https_proxy>
-                                            </args>
-                                            -->
                                             <dockerFileDir>${project.basedir}</dockerFileDir>
+                                            <tags>
+                                                <tag>${project.version}-${maven.build.timestamp}Z</tag>
+                                                <tag>${project.version}</tag>
+                                                <tag>latest</tag>
+                                            </tags>
                                         </build>
                                     </image>
                                 </images>
                             </configuration>
+                            <dependencies>
+                                <dependency>
+                                    <groupId>io.fabric8</groupId>
+                                    <artifactId>run-java-sh</artifactId>
+                                    <version>1.2.2</version>
+                                </dependency>
+                            </dependencies>
                         </plugin>
                     </plugins>
                 </pluginManagement>
@@ -452,19 +473,6 @@
     </profiles>
 
     <pluginRepositories>
-        <pluginRepository>
-            <id>40_openecomp-release</id>
-            <name>40_openecomp-release</name>
-            <url>https://nexus.onap.org/content/repositories/releases/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-
         <pluginRepository>
             <id>arturbosch-code-analysis</id>
             <name>arturbosch-code-analysis (for detekt)</name>
@@ -501,7 +509,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>25.0-jre</version>
+
                 <exclusions>
                     <exclusion>
                         <groupId>com.google.code.findbugs</groupId>
@@ -519,6 +527,11 @@
                 <artifactId>kotlin-reflect</artifactId>
                 <version>${kotlin.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlinx</groupId>
+                <artifactId>kotlinx-coroutines-core</artifactId>
+                <version>0.25.0</version>
+            </dependency>
             <dependency>
                 <groupId>io.arrow-kt</groupId>
                 <artifactId>arrow-core</artifactId>
@@ -554,6 +567,11 @@
                 <artifactId>arrow-effects</artifactId>
                 <version>${arrow.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.arrow-kt</groupId>
+                <artifactId>arrow-effects-reactor</artifactId>
+                <version>${arrow.version}</version>
+            </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
@@ -603,6 +621,13 @@
                 <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>
@@ -667,5 +692,3 @@
         </dependencies>
     </dependencyManagement>
 </project>
-
-