From 8de37f9d3035b4a41e696b967f2222806c250925 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Fri, 11 Sep 2020 13:58:42 -0400
Subject: Refactoring poms groupId artifactId

Issue-ID: CCSDK-2787
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ica64f0c793beabb47950c7bf1eede63a0dbf3cea
---
 ms/sdclistener/application/pom.xml  | 27 ++++++++++++---------------
 ms/sdclistener/distribution/pom.xml |  9 ++++-----
 ms/sdclistener/parent/pom.xml       | 13 ++++++-------
 ms/sdclistener/pom.xml              |  7 +++----
 4 files changed, 25 insertions(+), 31 deletions(-)

(limited to 'ms/sdclistener')

diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml
index 6f5fac107..a1ea90c84 100644
--- a/ms/sdclistener/application/pom.xml
+++ b/ms/sdclistener/application/pom.xml
@@ -20,16 +20,16 @@
 
     <parent>
         <groupId>org.onap.ccsdk.cds.sdclistener</groupId>
-        <artifactId>parent</artifactId>
+        <artifactId>sdclistener-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
-    <artifactId>application</artifactId>
+    <artifactId>sdclistener-application</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>SDC Listener Application</name>
+    <name>MS SDC Listener - Application</name>
 
     <properties>
         <protobuf.version>3.6.1</protobuf.version>
@@ -53,11 +53,10 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+            <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
             <artifactId>health-api-common</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${ccsdk.cds.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -71,19 +70,18 @@
             <groupId>org.onap.sdc.sdc-distribution-client</groupId>
             <artifactId>sdc-distribution-client</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.jmockit</groupId>
             <artifactId>jmockit</artifactId>
             <version>${jmockit.version}</version>
             <scope>test</scope>
         </dependency>
-		<dependency>
-			<groupId>org.jacorb</groupId>
-			<artifactId>jacorb-omgapi</artifactId>
-			<version>3.8</version>
-			<scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>org.jacorb</groupId>
+            <artifactId>jacorb-omgapi</artifactId>
+            <version>3.8</version>
+            <scope>test</scope>
+        </dependency>
         <!-- GRPC Dependencies -->
         <dependency>
             <groupId>io.grpc</groupId>
@@ -119,10 +117,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+            <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
             <artifactId>blueprint-proto</artifactId>
         </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
diff --git a/ms/sdclistener/distribution/pom.xml b/ms/sdclistener/distribution/pom.xml
index ec02cfb5c..ac241230b 100755
--- a/ms/sdclistener/distribution/pom.xml
+++ b/ms/sdclistener/distribution/pom.xml
@@ -20,15 +20,15 @@
 
     <parent>
         <groupId>org.onap.ccsdk.cds.sdclistener</groupId>
-        <artifactId>parent</artifactId>
+        <artifactId>sdclistener-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
-    <artifactId>distribution</artifactId>
+    <artifactId>sdclistener-distribution</artifactId>
     <packaging>pom</packaging>
 
-    <name>SDC Listener Distribution</name>
+    <name>MS SDC Listener - Distribution</name>
 
     <properties>
         <assembly.id>maven</assembly.id>
@@ -39,14 +39,13 @@
         <!--<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>-->
         <docker.push.phase>deploy</docker.push.phase>
         <docker.verbose>true</docker.verbose>
-        <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.cds.sdclistener</groupId>
-            <artifactId>application</artifactId>
+            <artifactId>sdclistener-application</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml
index d6aed85a6..93b694cde 100755
--- a/ms/sdclistener/parent/pom.xml
+++ b/ms/sdclistener/parent/pom.xml
@@ -27,11 +27,10 @@
     </parent>
 
     <groupId>org.onap.ccsdk.cds.sdclistener</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>sdclistener-parent</artifactId>
     <packaging>pom</packaging>
 
-    <name>SDC Listener Parent</name>
-    <description>SDC Listener Parent</description>
+    <name>MS SDC Listener - Parent</name>
 
     <properties>
         <eelf.version>1.0.0</eelf.version>
@@ -44,6 +43,7 @@
         <sdc-distribution-client.version>1.4.0</sdc-distribution-client.version>
         <jmockit.version>1.49</jmockit.version>
         <reactorcore.version>3.2.6.RELEASE</reactorcore.version>
+        <ccsdk.cds.version>${project.version}</ccsdk.cds.version>
     </properties>
 
     <dependencyManagement>
@@ -78,8 +78,7 @@
                 <artifactId>commons-compress</artifactId>
                 <version>1.15</version>
             </dependency>
-
-            <dependency>
+        <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
@@ -127,7 +126,7 @@
                 <version>${protobuff.java.utils.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId>
+                <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
                 <artifactId>blueprint-proto</artifactId>
                 <version>${project.version}</version>
                 <exclusions>
@@ -155,7 +154,7 @@
             <!-- SDC Distribution client dependency -->
             <dependency>
                 <groupId>org.onap.ccsdk.cds.sdclistener</groupId>
-                <artifactId>application</artifactId>
+                <artifactId>sdclistener-application</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
diff --git a/ms/sdclistener/pom.xml b/ms/sdclistener/pom.xml
index bed1056ab..b46a68940 100644
--- a/ms/sdclistener/pom.xml
+++ b/ms/sdclistener/pom.xml
@@ -20,7 +20,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.cds</groupId>
-        <artifactId>ms</artifactId>
+        <artifactId>cds-ms</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
@@ -28,8 +28,7 @@
     <artifactId>sdclistener</artifactId>
     <packaging>pom</packaging>
 
-    <name>SDC Listener Root</name>
-    <description>SDC Listener Root</description>
+    <name>MS SDC Listener (Root)</name>
 
     <modules>
         <module>parent</module>
@@ -43,6 +42,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <build.number>${maven.build.timestamp}</build.number>
-        <ccsdk.project.version>${project.version}</ccsdk.project.version>
+        <ccsdk.cds.version>${project.version}</ccsdk.cds.version>
     </properties>
 </project>
-- 
cgit 1.2.3-korg