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/sodium/pom.xml | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

(limited to 'opendaylight/sodium/pom.xml')

diff --git a/opendaylight/sodium/pom.xml b/opendaylight/sodium/pom.xml
index 6310fea9..fe63f6db 100644
--- a/opendaylight/sodium/pom.xml
+++ b/opendaylight/sodium/pom.xml
@@ -9,33 +9,27 @@
     </parent>
 
     <artifactId>distribution-odl-sodium</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>ccsdk-distribution :: opendaylight</name>
+    <name>ccsdk-distribution :: opendaylight :: sodium</name>
     <description>Creates OpenDaylight container</description>
-    
-    <properties>
-		<ccsdk.project.version>${project.version}</ccsdk.project.version>
-		<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-		<ccsdk.opendaylight.version>0.11.4</ccsdk.opendaylight.version>
-		<docker.push.phase>deploy</docker.push.phase>
-    </properties>
-    
-    	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.opendaylight.integration</groupId>
-				<artifactId>onap-karaf</artifactId>
-				<version>${ccsdk.opendaylight.version}</version>
-				<type>tar.gz</type>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-
 
     <modules>
-    	    <module>sodium-alpine</module>
+        <module>sodium-alpine</module>
     </modules>
+
+    <properties>
+        <ccsdk.opendaylight.version>0.11.4</ccsdk.opendaylight.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.integration</groupId>
+                <artifactId>onap-karaf</artifactId>
+                <version>${ccsdk.opendaylight.version}</version>
+                <type>tar.gz</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>
-- 
cgit 1.2.3-korg