From 1d4ce8d163b0e41bfb7d9e76399606eb0ba6f04c Mon Sep 17 00:00:00 2001
From: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Date: Wed, 5 Feb 2020 16:28:33 -0500
Subject: [PATCH] Updating module names to resolve conflicts

Issue-ID: POLICY-2355
Change-Id: Ie54b9be776a96f02a62645cc804060e562d994ba
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
---
 main/pom.xml                        | 3 ++-
 packages/policy-api-docker/pom.xml  | 5 +++--
 packages/policy-api-tarball/pom.xml | 5 +++--
 packages/pom.xml                    | 5 +++--
 testsuites/performance/pom.xml      | 5 +++--
 testsuites/pom.xml                  | 3 ++-
 testsuites/stability/pom.xml        | 5 +++--
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index d7552fcb..56a5f812 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -3,6 +3,7 @@
    Copyright (C) 2018 Ericsson. All rights reserved.
    Modified Copyright (C) 2018 Samsung Electronics Co., Ltd.
    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.
@@ -28,7 +29,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>main</artifactId>
+    <artifactId>api-main</artifactId>
 
     <name>${project.artifactId}</name>
     <description>The main module of Policy Api that handles startup, lifecycle management, and parameters.</description>
diff --git a/packages/policy-api-docker/pom.xml b/packages/policy-api-docker/pom.xml
index d3e4b04b..74d383d8 100644
--- a/packages/policy-api-docker/pom.xml
+++ b/packages/policy-api-docker/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    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.
@@ -25,13 +26,13 @@
 
     <parent>
         <groupId>org.onap.policy.api</groupId>
-        <artifactId>packages</artifactId>
+        <artifactId>api-packages</artifactId>
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>
     <artifactId>policy-api-docker</artifactId>
-    <name>Policy api docker image</name>
+    <name>${project.artifactId}</name>
     <description>Policy api docker image</description>
 
     <properties>
diff --git a/packages/policy-api-tarball/pom.xml b/packages/policy-api-tarball/pom.xml
index d0325959..e0d1ca80 100644
--- a/packages/policy-api-tarball/pom.xml
+++ b/packages/policy-api-tarball/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    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.
@@ -23,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.api</groupId>
-        <artifactId>packages</artifactId>
+        <artifactId>api-packages</artifactId>
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
@@ -34,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.policy.api</groupId>
-            <artifactId>main</artifactId>
+            <artifactId>api-main</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/packages/pom.xml b/packages/pom.xml
index b7c0d604..0352ef98 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    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.
@@ -26,9 +27,9 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>packages</artifactId>
+    <artifactId>api-packages</artifactId>
     <packaging>pom</packaging>
-    <name>Policy api packages</name>
+    <name>${project.artifactId}</name>
 
     <properties>
         <!-- There is no code in this sub-module, only holds interfaces. So skip sonar. -->
diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index ff899b8e..767065d8 100644
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/pom.xml
@@ -3,6 +3,7 @@
   ONAP Policy API
   ================================================================================
   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.api</groupId>
-        <artifactId>testsuites</artifactId>
+        <artifactId>api-testsuites</artifactId>
         <version>2.2.0-SNAPSHOT</version>
     </parent>
-    <artifactId>performance</artifactId>
+    <artifactId>api-performance</artifactId>
     <build>
         <plugins>
             <plugin>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 4d2951a8..8d350a4b 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -3,6 +3,7 @@
   ONAP Policy API
   ================================================================================
   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.
@@ -25,7 +26,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>testsuites</artifactId>
+    <artifactId>api-testsuites</artifactId>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml
index acedf6ca..51f3d233 100644
--- a/testsuites/stability/pom.xml
+++ b/testsuites/stability/pom.xml
@@ -3,6 +3,7 @@
   ONAP Policy API
   ================================================================================
   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.api</groupId>
-        <artifactId>testsuites</artifactId>
+        <artifactId>api-testsuites</artifactId>
         <version>2.2.0-SNAPSHOT</version>
     </parent>
-    <artifactId>stability</artifactId>
+    <artifactId>api-stability</artifactId>
     <build>
         <plugins>
             <plugin>
-- 
2.16.6