From 7d397bd49ffc2c61d70aa65353f2188bc1264abb Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Mon, 21 Sep 2020 09:53:32 -0400
Subject: Fixing docker image tag

Moving related properties to parent most pom and using same across
Removing unnecessary version tag from poms

Issue-ID: CCSDK-2794
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I37d16d3f7a467bb579f70235f69a8bff0fe4ba8e
---
 cds-ui/application/pom.xml     |  1 -
 cds-ui/client/pom.xml          |  1 -
 cds-ui/designer-client/pom.xml |  1 -
 cds-ui/pom.xml                 | 19 ++++---------------
 cds-ui/server/pom.xml          |  1 -
 5 files changed, 4 insertions(+), 19 deletions(-)

(limited to 'cds-ui')

diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml
index 22d5cabc8..cf4813701 100644
--- a/cds-ui/application/pom.xml
+++ b/cds-ui/application/pom.xml
@@ -30,7 +30,6 @@ limitations under the License.
     </parent>
 
     <artifactId>cds-ui-application</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>UI Application</name>
diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml
index ec0326a7e..63ff9fbbc 100644
--- a/cds-ui/client/pom.xml
+++ b/cds-ui/client/pom.xml
@@ -30,7 +30,6 @@ limitations under the License.
     </parent>
 
     <artifactId>cds-ui-client</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>UI Client</name>
diff --git a/cds-ui/designer-client/pom.xml b/cds-ui/designer-client/pom.xml
index 34f56e1f7..01504fb35 100644
--- a/cds-ui/designer-client/pom.xml
+++ b/cds-ui/designer-client/pom.xml
@@ -30,7 +30,6 @@ limitations under the License.
     </parent>
 
     <artifactId>cds-ui-designer-client</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>UI designer Client</name>
diff --git a/cds-ui/pom.xml b/cds-ui/pom.xml
index 6d547326c..285e63ef9 100644
--- a/cds-ui/pom.xml
+++ b/cds-ui/pom.xml
@@ -23,15 +23,13 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.cds</groupId>
+        <artifactId>cds-aggregator</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
-    <groupId>org.onap.ccsdk.cds</groupId>
     <artifactId>cds-ui</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>UI Parent</name>
@@ -46,14 +44,5 @@ limitations under the License.
 
     <properties>
         <npm.executable>npm</npm.executable>
-        <image.name>onap/ccsdk-cds-ui</image.name>
-        <ccsdk.cds.version>${project.version}</ccsdk.cds.version>
-        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-
-        <!-- docker related properties -->
-        <docker.verbose>true</docker.verbose>
-        <docker.skip.push>false</docker.skip.push>
-        <docker.push.phase>deploy</docker.push.phase>
     </properties>
 </project>
diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml
index 6444385ee..6d9bc1420 100644
--- a/cds-ui/server/pom.xml
+++ b/cds-ui/server/pom.xml
@@ -30,7 +30,6 @@ limitations under the License.
     </parent>
 
     <artifactId>cds-ui-server</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>UI Server</name>
-- 
cgit 1.2.3-korg