From f501c40e5da5e489ad9daae848258a05d43104fc Mon Sep 17 00:00:00 2001
From: sourabh_sourabh <sourabh.sourabh@est.tech>
Date: Tue, 26 Nov 2024 13:45:56 +0000
Subject: [PATCH] [DMI] Fix for DMI merge master Job

- ncmp-dmi-plugin group id is changed from "org.onap.cps" to "org.onap.cps.ncmp-dmi-plugin"

Issue-ID: CPS-2499
Change-Id: I6db7093c48c0f11ca2ef172458951a379d42d255
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
---
 dmi-service/pom.xml               | 8 ++++----
 dmi-stub/dmi-stub-app/pom.xml     | 4 ++--
 dmi-stub/dmi-stub-service/pom.xml | 4 ++--
 dmi-stub/pom.xml                  | 4 ++--
 pom.xml                           | 9 +++++----
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/dmi-service/pom.xml b/dmi-service/pom.xml
index 1ad12471..c79889ac 100644
--- a/dmi-service/pom.xml
+++ b/dmi-service/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.cps</groupId>
+        <groupId>org.onap.cps.ncmp-dmi-plugin</groupId>
         <artifactId>ncmp-dmi-plugin</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
@@ -160,7 +160,7 @@
                 <version>1.18.24</version>
             </dependency>
             <dependency>
-                <groupId>org.onap.cps</groupId>
+                <groupId>${cps.groupId}</groupId>
                 <artifactId>cps-ncmp-events</artifactId>
                 <version>${cps.version}</version>
             </dependency>
@@ -264,7 +264,7 @@
             <artifactId>jetty-http</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.onap.cps</groupId>
+            <groupId>${cps.groupId}</groupId>
             <artifactId>cps-ncmp-events</artifactId>
             <version>${cps.version}</version>
         </dependency>
@@ -486,7 +486,7 @@
                 </executions>
                 <dependencies>
                     <dependency>
-                        <groupId>${project.groupId}</groupId>
+                        <groupId>${cps.groupId}</groupId>
                         <artifactId>spotbugs</artifactId>
                         <version>${cps.version}</version>
                         <scope>compile</scope>
diff --git a/dmi-stub/dmi-stub-app/pom.xml b/dmi-stub/dmi-stub-app/pom.xml
index 210eb5c9..0367e452 100644
--- a/dmi-stub/dmi-stub-app/pom.xml
+++ b/dmi-stub/dmi-stub-app/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.cps</groupId>
+        <groupId>org.onap.cps.ncmp-dmi-plugin</groupId>
         <artifactId>dmi-stub</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
@@ -62,7 +62,7 @@
                 </exclusion></exclusions>
         </dependency>
         <dependency>
-            <groupId>org.onap.cps</groupId>
+            <groupId>org.onap.cps.ncmp-dmi-plugin</groupId>
             <artifactId>dmi-stub-service</artifactId>
             <version>${project.version}</version>
             <exclusions>
diff --git a/dmi-stub/dmi-stub-service/pom.xml b/dmi-stub/dmi-stub-service/pom.xml
index 171b5d90..211a0b33 100644
--- a/dmi-stub/dmi-stub-service/pom.xml
+++ b/dmi-stub/dmi-stub-service/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.cps</groupId>
+        <groupId>org.onap.cps.ncmp-dmi-plugin</groupId>
         <artifactId>dmi-stub</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
@@ -99,7 +99,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.onap.cps</groupId>
+            <groupId>${cps.groupId}</groupId>
             <artifactId>cps-ncmp-events</artifactId>
             <version>${cps.version}</version>
         </dependency>
diff --git a/dmi-stub/pom.xml b/dmi-stub/pom.xml
index 1d361da2..0c7c0518 100644
--- a/dmi-stub/pom.xml
+++ b/dmi-stub/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.cps</groupId>
+        <groupId>org.onap.cps.ncmp-dmi-plugin</groupId>
         <artifactId>ncmp-dmi-plugin</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
@@ -46,7 +46,7 @@
 <dependencyManagement>
         <dependencies>
             <dependency>
-                 <groupId>org.onap.cps</groupId>
+                 <groupId>${cps.groupId}</groupId>
                  <artifactId>cps-dependencies</artifactId>
                  <version>${cps.version}</version>
                  <type>pom</type>
diff --git a/pom.xml b/pom.xml
index 38ef414a..bb65d740 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
         <module>dmi-stub</module>
     </modules>
 
-    <groupId>org.onap.cps</groupId>
+    <groupId>org.onap.cps.ncmp-dmi-plugin</groupId>
     <artifactId>ncmp-dmi-plugin</artifactId>
     <version>1.6.0-SNAPSHOT</version>
     <name>ncmp-dmi-plugin</name>
@@ -51,7 +51,8 @@
         <image.tag>${project.version}-${maven.build.timestamp}</image.tag>
 
         <!-- Project Versioning and Timestamp -->
-        <cps.version>3.5.5-SNAPSHOT</cps.version>
+        <cps.groupId>org.onap.cps</cps.groupId>
+        <cps.version> 3.5.5-SNAPSHOT</cps.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 
         <!-- Code Quality and Dependency Management -->
@@ -88,7 +89,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>${project.groupId}</groupId>
+                                    <groupId>${cps.groupId}</groupId>
                                     <artifactId>checkstyle</artifactId>
                                     <version>${cps.version}</version>
                                     <type>jar</type>
@@ -149,7 +150,7 @@
                 </executions>
                 <dependencies>
                     <dependency>
-                        <groupId>${project.groupId}</groupId>
+                        <groupId>${cps.groupId}</groupId>
                         <artifactId>checkstyle</artifactId>
                         <version>${cps.version}</version>
                     </dependency>
-- 
2.16.6