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>
---
 client/client-deployment/pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'client/client-deployment/pom.xml')

diff --git a/client/client-deployment/pom.xml b/client/client-deployment/pom.xml
index 5aa8f41a3..149410a46 100644
--- a/client/client-deployment/pom.xml
+++ b/client/client-deployment/pom.xml
@@ -2,6 +2,7 @@
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
    Modifications Copyright (C) 2019 Nordix Foundation.
+   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,11 +24,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.apex-pdp.client</groupId>
-        <artifactId>client</artifactId>
+        <artifactId>apex-client</artifactId>
         <version>2.3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>client-deployment</artifactId>
+    <artifactId>apex-client-deployment</artifactId>
     <name>${project.artifactId}</name>
     <description>Web client for deploying models in Apex engine</description>
 
@@ -62,7 +63,7 @@
 
         <dependency>
             <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>client-common</artifactId>
+            <artifactId>apex-client-common</artifactId>
             <version>${project.version}</version>
             <classifier>resources</classifier>
             <type>zip</type>
@@ -90,7 +91,7 @@
                         <configuration>
                             <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory>
        <!--use as much as needed to be specific...also scope,type,classifier etc-->
-                            <includeArtifacIds>client-common</includeArtifacIds>
+                            <includeArtifacIds>apex-client-common</includeArtifacIds>
                             <includeGroupIds>org.onap.policy.apex-pdp.client</includeGroupIds>
                             <excludeTransitive>true</excludeTransitive>
                             <excludeTransitive>true</excludeTransitive>
-- 
cgit 1.2.3-korg