Merge "Updating module names to resolve conflicts"

17 files changed, 33 insertions, 21 deletions

diff --git a/controlloop/common/controller-usecases/pom.xml b/controlloop/common/controller-usecases/pom.xml
index 3c299334b..a3f533599 100644
--- a/controlloop/common/controller-usecases/pom.xml
+++ b/controlloop/common/controller-usecases/pom.xml
@@ -5,7 +5,7 @@
   ================================================================================
   Copyright (C) 2018-2019 AT&T Intellectual Property. 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.
@@ -26,7 +26,7 @@
 
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-        <artifactId>common</artifactId>
+        <artifactId>drools-applications-common</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
diff --git a/controlloop/common/coordination/pom.xml b/controlloop/common/coordination/pom.xml
index 502dd4edb..03220e9d1 100644
--- a/controlloop/common/coordination/pom.xml
+++ b/controlloop/common/coordination/pom.xml
@@ -3,6 +3,7 @@
   drools-applications
   ================================================================================
   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.
@@ -22,7 +23,7 @@
 
   <parent>
     <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-    <artifactId>common</artifactId>
+    <artifactId>drools-applications-common</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
diff --git a/controlloop/common/database/pom.xml b/controlloop/common/database/pom.xml
index a829d9f7b..12f2c8bf4 100644
--- a/controlloop/common/database/pom.xml
+++ b/controlloop/common/database/pom.xml
@@ -3,6 +3,7 @@
   drools-applications
   ================================================================================
   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.
@@ -22,7 +23,7 @@
 
   <parent>
     <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-    <artifactId>common</artifactId>
+    <artifactId>drools-applications-common</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml
index a04264958..7b3985551 100644
--- a/controlloop/common/eventmanager/pom.xml
+++ b/controlloop/common/eventmanager/pom.xml
@@ -4,7 +4,7 @@
   ================================================================================
   Copyright (C) 2017-2020 AT&T Intellectual Property. 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.
@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-    <artifactId>common</artifactId>
+    <artifactId>drools-applications-common</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
diff --git a/controlloop/common/feature-controlloop-amsterdam/pom.xml b/controlloop/common/feature-controlloop-amsterdam/pom.xml
index 64f3b6daf..42980119e 100644
--- a/controlloop/common/feature-controlloop-amsterdam/pom.xml
+++ b/controlloop/common/feature-controlloop-amsterdam/pom.xml
@@ -3,6 +3,7 @@
   ONAP
   ================================================================================
   Copyright (C) 2018-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 @@
 
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-        <artifactId>common</artifactId>
+        <artifactId>drools-applications-common</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml
index e75d78e3d..75c38bcd3 100644
--- a/controlloop/common/feature-controlloop-management/pom.xml
+++ b/controlloop/common/feature-controlloop-management/pom.xml
@@ -4,6 +4,7 @@
   ================================================================================
   Copyright (C) 2018-2020 AT&T Intellectual Property. 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.
@@ -24,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-        <artifactId>common</artifactId>
+        <artifactId>drools-applications-common</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
diff --git a/controlloop/common/feature-controlloop-trans/pom.xml b/controlloop/common/feature-controlloop-trans/pom.xml
index fb60926aa..d6e43cdf5 100644
--- a/controlloop/common/feature-controlloop-trans/pom.xml
+++ b/controlloop/common/feature-controlloop-trans/pom.xml
@@ -4,6 +4,7 @@
   ================================================================================
   Copyright (C) 2018-2020 AT&T Intellectual Property. 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.
@@ -24,7 +25,7 @@
 
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-        <artifactId>common</artifactId>
+        <artifactId>drools-applications-common</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
diff --git a/controlloop/common/feature-controlloop-usecases/pom.xml b/controlloop/common/feature-controlloop-usecases/pom.xml
index 39d90d107..6e40e1bda 100644
--- a/controlloop/common/feature-controlloop-usecases/pom.xml
+++ b/controlloop/common/feature-controlloop-usecases/pom.xml
@@ -3,6 +3,7 @@
   ONAP
   ================================================================================
   Copyright (C) 2018-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 @@
 
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-        <artifactId>common</artifactId>
+        <artifactId>drools-applications-common</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
diff --git a/controlloop/common/feature-controlloop-utils/pom.xml b/controlloop/common/feature-controlloop-utils/pom.xml
index 470aafcfe..9bed5a545 100644
--- a/controlloop/common/feature-controlloop-utils/pom.xml
+++ b/controlloop/common/feature-controlloop-utils/pom.xml
@@ -4,6 +4,7 @@
   ================================================================================
   Copyright (C) 2017-2018 AT&T Intellectual Property. 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.
@@ -24,7 +25,7 @@
 
   <parent>
     <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-    <artifactId>common</artifactId>
+    <artifactId>drools-applications-common</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
diff --git a/controlloop/common/guard/pom.xml b/controlloop/common/guard/pom.xml
index c8d865707..b3ef2b0ef 100644
--- a/controlloop/common/guard/pom.xml
+++ b/controlloop/common/guard/pom.xml
@@ -3,6 +3,7 @@
   drools-pdp-apps
   ================================================================================
   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.
@@ -22,7 +23,7 @@
 
   <parent>
     <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-    <artifactId>common</artifactId>
+    <artifactId>drools-applications-common</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
 
diff --git a/controlloop/common/pom.xml b/controlloop/common/pom.xml
index b1474404a..3ef03b11d 100644
--- a/controlloop/common/pom.xml
+++ b/controlloop/common/pom.xml
@@ -3,6 +3,7 @@
     Drools PDP Application Common Models
     ================================================================================
     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.
@@ -29,7 +30,7 @@
   </parent>
 
   <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-  <artifactId>common</artifactId>
+  <artifactId>drools-applications-common</artifactId>
 
   <modules>
     <module>database</module>
diff --git a/controlloop/common/simulators/pom.xml b/controlloop/common/simulators/pom.xml
index 66a32a1f7..bde8a5ce1 100644
--- a/controlloop/common/simulators/pom.xml
+++ b/controlloop/common/simulators/pom.xml
@@ -4,6 +4,7 @@
   ================================================================================
   Copyright (C) 2017-2018 AT&T Intellectual Property. 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.
@@ -24,7 +25,7 @@
 
   <parent>
     <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-    <artifactId>common</artifactId>
+    <artifactId>drools-applications-common</artifactId>
     <version>1.4.2-SNAPSHOT</version>
   </parent>
 
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>