Updating module names to resolve conflicts

Issue-ID: POLICY-2355
Change-Id: I64b6cd06186152a08df9b8bd11c21c154067fab1
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>

diff --git a/.gitignore b/.gitignore
index 144f267..8b15fc5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ target/
 */sql/
 */testingLogs/
 **/*.iml
+.checkstyle

diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 2a58a92..12f6fe7 100644 (file)
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -3,6 +3,7 @@
   Policy Packages
   ================================================================================
   Copyright (C) 2017-2018 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 @@
 
     <parent>
         <groupId>org.onap.policy.drools-pdp</groupId>
-        <artifactId>packages</artifactId>
+        <artifactId>drools-packages</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index d9e2133..d6028fe 100644 (file)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.policy.drools-pdp</groupId>
-        <artifactId>packages</artifactId>
+        <artifactId>drools-packages</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 

diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index 69eb0b6..058b614 100644 (file)
--- a/packages/install/pom.xml
+++ b/packages/install/pom.xml
@@ -3,6 +3,7 @@
   Policy Packages
   ================================================================================
   Copyright (C) 2017 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,7 +27,7 @@
 
     <parent>
         <groupId>org.onap.policy.drools-pdp</groupId>
-        <artifactId>packages</artifactId>
+        <artifactId>drools-packages</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 

diff --git a/packages/pom.xml b/packages/pom.xml
index 267f02d..39fa17f 100644 (file)
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -3,7 +3,7 @@
   ONAP Policy Engine - Drools PDP
   ================================================================================
   Copyright (C) 2017, 2019-2020 AT&T Intellectual Property. 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 @@
         <artifactId>drools-pdp</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
-    <artifactId>packages</artifactId>
+    <artifactId>drools-packages</artifactId>
     <packaging>pom</packaging>
     <name>Policy Packages</name>
     <description>ONAP Policy Drools PDP Installation Packages</description>