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

Issue-ID: POLICY-2355
Change-Id: I67f0ca2ced9cbe37a3d00d9f312101e756454107
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
---
 packages/apex-pdp-docker/pom.xml       |  4 ++--
 packages/apex-pdp-package-full/pom.xml | 20 ++++++++++----------
 packages/pom.xml                       |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'packages')

diff --git a/packages/apex-pdp-docker/pom.xml b/packages/apex-pdp-docker/pom.xml
index 25c27189a..6d21e1ca4 100644
--- a/packages/apex-pdp-docker/pom.xml
+++ b/packages/apex-pdp-docker/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2019 Bell Canada.
+   Modifications Copyright (C) 2019-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.
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.apex-pdp.packages</groupId>
-        <artifactId>packages</artifactId>
+        <artifactId>apex-packages</artifactId>
         <version>2.3.0-SNAPSHOT</version>
     </parent>
 
diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index b9b0613d6..daee292d8 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
    Modifications Copyright (C) 2019 Nordix Foundation
-   Modifications Copyright (C) 2019 Bell Canada.
+   Modifications Copyright (C) 2019-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 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.apex-pdp.packages</groupId>
-        <artifactId>packages</artifactId>
+        <artifactId>apex-packages</artifactId>
         <version>2.3.0-SNAPSHOT</version>
     </parent>
 
@@ -50,25 +50,25 @@
         <!-- Client Servlet applications -->
         <dependency>
             <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>client-full</artifactId>
+            <artifactId>apex-client-full</artifactId>
             <type>war</type>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>client-editor</artifactId>
+            <artifactId>apex-client-editor</artifactId>
             <type>war</type>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>client-deployment</artifactId>
+            <artifactId>apex-client-deployment</artifactId>
             <type>war</type>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>client-monitoring</artifactId>
+            <artifactId>apex-client-monitoring</artifactId>
             <type>war</type>
             <version>${project.version}</version>
         </dependency>
@@ -465,28 +465,28 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.client</groupId>
-                                    <artifactId>client-monitoring</artifactId>
+                                    <artifactId>apex-client-monitoring</artifactId>
                                     <version>${project.version}</version>
                                     <classifier>monitoring</classifier>
                                     <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.client</groupId>
-                                    <artifactId>client-editor</artifactId>
+                                    <artifactId>apex-client-editor</artifactId>
                                     <version>${project.version}</version>
                                     <classifier>editor</classifier>
                                     <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.client</groupId>
-                                    <artifactId>client-deployment</artifactId>
+                                    <artifactId>apex-client-deployment</artifactId>
                                     <version>${project.version}</version>
                                     <classifier>deployment</classifier>
                                     <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.client</groupId>
-                                    <artifactId>client-full</artifactId>
+                                    <artifactId>apex-client-full</artifactId>
                                     <version>${project.version}</version>
                                     <classifier>full</classifier>
                                     <outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
diff --git a/packages/pom.xml b/packages/pom.xml
index a90a4ae55..940eeb26d 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2019 Bell Canada.
+   Modifications Copyright (C) 2019-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,7 +27,7 @@
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.packages</groupId>
-    <artifactId>packages</artifactId>
+    <artifactId>apex-packages</artifactId>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
-- 
cgit 1.2.3-korg