From a5355400c0e394a5e152db88e3f1a1ffc1207511 Mon Sep 17 00:00:00 2001
From: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Date: Wed, 5 Feb 2020 16:10:59 -0500
Subject: Updating module names to resolve conflicts

Issue-ID: POLICY-2355
Change-Id: I84fe65adb91284f1537ed0422aced705e765b05c
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
---
 main/pom.xml                                 | 3 ++-
 packages/policy-distribution-docker/pom.xml  | 5 +++--
 packages/policy-distribution-tarball/pom.xml | 5 +++--
 packages/pom.xml                             | 5 +++--
 plugins/forwarding-plugins/pom.xml           | 3 ++-
 testsuites/performance/pom.xml               | 5 +++--
 testsuites/pom.xml                           | 3 ++-
 testsuites/stability/pom.xml                 | 5 +++--
 8 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index a218c6b4..c57bef42 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -25,7 +26,7 @@
         <version>2.3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>main</artifactId>
+    <artifactId>distribution-main</artifactId>
 
     <name>${project.artifactId}</name>
     <description>The main module of Policy Distribution that handles startup, lifecycle management, and parameters.</description>
diff --git a/packages/policy-distribution-docker/pom.xml b/packages/policy-distribution-docker/pom.xml
index dcbbe1e6..5318994d 100644
--- a/packages/policy-distribution-docker/pom.xml
+++ b/packages/policy-distribution-docker/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -25,13 +26,13 @@
 
     <parent>
         <groupId>org.onap.policy.distribution</groupId>
-        <artifactId>packages</artifactId>
+        <artifactId>distribution-packages</artifactId>
         <version>2.3.0-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>
     <artifactId>policy-distribution-docker</artifactId>
-    <name>Policy distribution docker image</name>
+    <name>${project.artifactId}</name>
     <description>Policy distribution docker image</description>
 
     <properties>
diff --git a/packages/policy-distribution-tarball/pom.xml b/packages/policy-distribution-tarball/pom.xml
index 1d673ce3..d13fcf60 100644
--- a/packages/policy-distribution-tarball/pom.xml
+++ b/packages/policy-distribution-tarball/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -23,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.distribution</groupId>
-        <artifactId>packages</artifactId>
+        <artifactId>distribution-packages</artifactId>
         <version>2.3.0-SNAPSHOT</version>
     </parent>
 
@@ -34,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.policy.distribution</groupId>
-            <artifactId>main</artifactId>
+            <artifactId>distribution-main</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/packages/pom.xml b/packages/pom.xml
index 6135313a..ae2050b9 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -2,6 +2,7 @@
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
    Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+   Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -27,9 +28,9 @@
         <version>2.3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>packages</artifactId>
+    <artifactId>distribution-packages</artifactId>
     <packaging>pom</packaging>
-    <name>Policy Distribution Packages</name>
+    <name>${project.artifactId}</name>
 
     <properties>
         <!-- There is no code in this sub-module, only holds interfaces. So skip sonar. -->
diff --git a/plugins/forwarding-plugins/pom.xml b/plugins/forwarding-plugins/pom.xml
index 1d6c7f7a..cdb45f72 100644
--- a/plugins/forwarding-plugins/pom.xml
+++ b/plugins/forwarding-plugins/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -37,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.distribution</groupId>
-            <artifactId>main</artifactId>
+            <artifactId>distribution-main</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index 859364a8..969aca58 100644
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/pom.xml
@@ -3,6 +3,7 @@
   ONAP Policy Distribution
   ================================================================================
   Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+  Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -21,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.distribution</groupId>
-        <artifactId>testsuites</artifactId>
+        <artifactId>distribution-testsuites</artifactId>
         <version>2.3.0-SNAPSHOT</version>
     </parent>
-    <artifactId>performance</artifactId>
+    <artifactId>distribution-performance</artifactId>
     <build>
         <plugins>
             <plugin>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 4d11dc1a..87464f8f 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -3,6 +3,7 @@
   ONAP Policy Distribution
   ================================================================================
   Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+  Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -24,7 +25,7 @@
         <artifactId>policy-distribution</artifactId>
         <version>2.3.0-SNAPSHOT</version>
     </parent>
-    <artifactId>testsuites</artifactId>
+    <artifactId>distribution-testsuites</artifactId>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml
index d9b6eb5a..fe7d767b 100644
--- a/testsuites/stability/pom.xml
+++ b/testsuites/stability/pom.xml
@@ -3,6 +3,7 @@
   ONAP Policy Distribution
   ================================================================================
   Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+  Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -21,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.distribution</groupId>
-        <artifactId>testsuites</artifactId>
+        <artifactId>distribution-testsuites</artifactId>
         <version>2.3.0-SNAPSHOT</version>
     </parent>
-    <artifactId>stability</artifactId>
+    <artifactId>distribution-stability</artifactId>
     <build>
         <plugins>
             <plugin>
-- 
cgit 1.2.3-korg