Align with release docker & JARs CI definitions

If not explocitly called with -DskipDockerPush=false Maven will not push
docker images to the registry. The change is introduced in order for
'{project-name}-{stream}-docker-java-shell-daily' to do the push but all
other Jenkins jobs should skip this step.

Also set hv-collector-analysis version to 1.0.0-SNAPSHOT as it's not a
child of root pom (it contains only custom definitions needed for detekt
plugin to work).

Change-Id: Icc4a1d6cc1a763fad417860b45ffdad30524f67b
Issue-ID: DCAEGEN2-661
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>

diff --git a/pom.xml b/pom.xml
index 7504d4f..127e4bd 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
 
         <!-- 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>
@@ -89,7 +90,6 @@
         <docker.http_proxy></docker.http_proxy>
     </properties>
 
-
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
@@ -338,7 +338,7 @@
                     <dependency>
                         <groupId>${project.groupId}</groupId>
                         <artifactId>hv-collector-analysis</artifactId>
-                        <version>${project.version}</version>
+                        <version>1.0.0-SNAPSHOT</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -420,6 +420,7 @@
                                 </execution>
                             </executions>
                             <configuration>
+                                <skipPush>${skipDockerPush}</skipPush>
                                 <verbose>true</verbose>
                                 <imagePullPolicy>IfNotPresent</imagePullPolicy>
                                 <images>