Merge "Updating module names to resolve conflicts"

5 files changed, 9 insertions, 7 deletions

diff --git a/controlloop/packages/apps-controlloop/pom.xml b/controlloop/packages/apps-controlloop/pom.xml
index 0f842174e..0a78585df 100644
--- a/controlloop/packages/apps-controlloop/pom.xml
+++ b/controlloop/packages/apps-controlloop/pom.xml
@@ -3,7 +3,7 @@
   ONAP
   ================================================================================
   Copyright (C) 2017-2019 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.
@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-    <artifactId>packages</artifactId>
+    <artifactId>drools-applications-packages</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
diff --git a/controlloop/packages/artifacts-controlloop/pom.xml b/controlloop/packages/artifacts-controlloop/pom.xml
index 1a93d519c..15e98860e 100644
--- a/controlloop/packages/artifacts-controlloop/pom.xml
+++ b/controlloop/packages/artifacts-controlloop/pom.xml
@@ -3,6 +3,7 @@
   PDP-D Application Installation 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.
@@ -24,7 +25,7 @@
 
   <parent>
     <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-    <artifactId>packages</artifactId>
+    <artifactId>drools-applications-packages</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
diff --git a/controlloop/packages/basex-controlloop/pom.xml b/controlloop/packages/basex-controlloop/pom.xml
index f1d0470f6..36b855528 100644
--- a/controlloop/packages/basex-controlloop/pom.xml
+++ b/controlloop/packages/basex-controlloop/pom.xml
@@ -3,6 +3,7 @@
   ONAP
   ================================================================================
   Copyright (C) 2017-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,7 +26,7 @@
 
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-        <artifactId>packages</artifactId>
+        <artifactId>drools-applications-packages</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
diff --git a/controlloop/packages/docker-controlloop/pom.xml b/controlloop/packages/docker-controlloop/pom.xml
index a4c893a19..3c5001336 100644
--- a/controlloop/packages/docker-controlloop/pom.xml
+++ b/controlloop/packages/docker-controlloop/pom.xml
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-        <artifactId>packages</artifactId>
+        <artifactId>drools-applications-packages</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>docker-controlloop</artifactId>
diff --git a/controlloop/packages/pom.xml b/controlloop/packages/pom.xml
index 2e8b1fbaf..8934d322f 100644
--- a/controlloop/packages/pom.xml
+++ b/controlloop/packages/pom.xml
@@ -3,7 +3,7 @@
   Drools PDP Application Models
   ================================================================================
   Copyright (C) 2017, 2019 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.
@@ -29,7 +29,7 @@
     <version>1.6.0-SNAPSHOT</version>
   </parent>
   <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-  <artifactId>packages</artifactId>
+  <artifactId>drools-applications-packages</artifactId>
   <name>PDP-D Application Installation Packages</name>
   <description>PDP-D Installation</description>
   <profiles>