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
---
 opendaylight/onap-distribution/fluorine/karaf/pom.xml | 2 +-
 opendaylight/onap-distribution/fluorine/pom.xml       | 3 +--
 opendaylight/onap-distribution/pom.xml                | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'opendaylight/onap-distribution')

diff --git a/opendaylight/onap-distribution/fluorine/karaf/pom.xml b/opendaylight/onap-distribution/fluorine/karaf/pom.xml
index ef718f5d..aca9b90d 100644
--- a/opendaylight/onap-distribution/fluorine/karaf/pom.xml
+++ b/opendaylight/onap-distribution/fluorine/karaf/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-opendaylight-onap-fluorine-karaf</artifactId>
     <version>0.4.1-SNAPSHOT</version>
-    <name>ccsdk-distribution :: onap :: opendaylight :: fluorine :: karaf</name>
+    <name>ccsdk-distribution :: opendaylight :: onap :: fluorine :: karaf</name>
     <modelVersion>4.0.0</modelVersion>
 
     <licenses>
diff --git a/opendaylight/onap-distribution/fluorine/pom.xml b/opendaylight/onap-distribution/fluorine/pom.xml
index 44f8269d..4d76a88d 100644
--- a/opendaylight/onap-distribution/fluorine/pom.xml
+++ b/opendaylight/onap-distribution/fluorine/pom.xml
@@ -9,9 +9,8 @@
     </parent>
 
     <artifactId>distribution-opendaylight-onap-fluorine-parent</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>ccsdk-distribution :: onap :: opendaylight :: fluorine :: parent</name>
+    <name>ccsdk-distribution :: opendaylight :: onap :: fluorine</name>
     <description>Creates ONAP's OpenDaylight Fluorine container</description>
 
     <modules>
diff --git a/opendaylight/onap-distribution/pom.xml b/opendaylight/onap-distribution/pom.xml
index dbc5a5b0..b6a4d464 100644
--- a/opendaylight/onap-distribution/pom.xml
+++ b/opendaylight/onap-distribution/pom.xml
@@ -9,10 +9,9 @@
     </parent>
 
     <artifactId>distribution-opendaylight-onap</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>ccsdk-distribution :: onap :: opendaylight :: parent</name>
+    <name>ccsdk-distribution :: opendaylight :: onap</name>
     <description>Creates ONAP's OpenDaylight distribution</description>
 
     <modules>
-- 
cgit 1.2.3-korg