From b6e7d96acfa2459c7a8c8f9fbdefcfacaf62e9f2 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Thu, 17 Dec 2020 14:37:06 -0500
Subject: 1) Adding docker.skip.push tag so that it can be used to skip docker
 push during verify job 2) Upgrading docker-maven-plugin to 0.34.0 and
 replacing dockerFileDir to contextDir 3) Refactoring execution section of
 docker-maven-plugin 4) Refactoring POM Names 5) Running mvn tidy:pom

Issue-ID: CCSDK-3057
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I19b9e231e5288e1372a9b3ac89d263bbb2209186
---
 alpine/java11/pom.xml | 29 ++++++++---------------------
 alpine/pom.xml        |  3 +--
 2 files changed, 9 insertions(+), 23 deletions(-)

(limited to 'alpine')

diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml
index 84a83dcf..75adb93b 100644
--- a/alpine/java11/pom.xml
+++ b/alpine/java11/pom.xml
@@ -9,7 +9,6 @@
     </parent>
 
     <artifactId>distribution-j11-alpine</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: alpine :: java11</name>
@@ -20,31 +19,28 @@
 
     <properties>
         <image.name>onap/ccsdk-alpine-j11-image</image.name>
-        <ccsdk.project.version>${project.version}</ccsdk.project.version>
-        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
         <base.image>onap/integration-java11</base.image>
         <base.image.version>7.1.0</base.image.version>
     </properties>
 
     <build>
         <plugins>
-
             <plugin>
                 <groupId>org.codehaus.groovy.maven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
                         <goals>
                             <goal>execute</goal>
                         </goals>
-                        <configuration>     
+                        <configuration>
                             <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.6</version>
@@ -81,38 +77,30 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.28.0</version>
+                        <version>0.34.0</version>
                         <inherited>false</inherited>
                         <configuration>
-
                             <images>
                                 <image>
                                     <name>${image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                                        <contextDir>${basedir}/target/docker-stage</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.docker.latestminortag.version}</tag>
-                                            <tag>${project.docker.latestfulltag.version}</tag>              
+                                            <tag>${project.docker.latestfulltag.version}</tag>
                                             <tag>${project.docker.latesttagtimestamp.version}</tag>
                                         </tags>
                                     </build>
                                 </image>
                             </images>
+                            <verbose>${docker.verbose}</verbose>
+                            <skipPush>${docker.skip.push}</skipPush>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>generate-images</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>build</goal>
-                                </goals>
-                            </execution>
-
-                            <execution>
-                                <id>push-images</id>
-                                <phase>deploy</phase>
+                                <id>build-push-images</id>
                                 <goals>
                                     <goal>build</goal>
                                     <goal>push</goal>
@@ -120,7 +108,6 @@
                             </execution>
                         </executions>
                     </plugin>
-
                 </plugins>
             </build>
         </profile>
diff --git a/alpine/pom.xml b/alpine/pom.xml
index 5ff34161..089b0af4 100644
--- a/alpine/pom.xml
+++ b/alpine/pom.xml
@@ -9,10 +9,9 @@
     </parent>
 
     <artifactId>distribution-alpine-root</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>ccsdk-distribution :: opendaylight</name>
+    <name>ccsdk-distribution :: alpine</name>
     <description>Creates OpenDaylight container</description>
 
     <modules>
-- 
cgit 1.2.3-korg