Updating module names to resolve conflicts

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

diff --git a/controlloop/common/controller-usecases/pom.xml b/controlloop/common/controller-usecases/pom.xml
index 3c29933..a3f5335 100644 (file)
--- 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 502dd4e..03220e9 100644 (file)
--- 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 a829d9f..12f2c8b 100644 (file)
--- 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 a042649..7b39855 100644 (file)
--- 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 64f3b6d..4298011 100644 (file)
--- 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 e75d78e..75c38bc 100644 (file)
--- 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 fb60926..d6e43cd 100644 (file)
--- 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 39d90d1..6e40e1b 100644 (file)
--- 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 470aafc..9bed5a5 100644 (file)
--- 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 c8d8657..b3ef2b0 100644 (file)
--- 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 b147440..3ef03b1 100644 (file)
--- 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 66a32a1..bde8a5c 100644 (file)
--- 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 0f84217..0a78585 100644 (file)
--- 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 1a93d51..15e9886 100644 (file)
--- 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 f1d0470..36b8555 100644 (file)
--- 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 a4c893a..3c50013 100644 (file)
--- 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 2e8b1fb..8934d32 100644 (file)
--- 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>

diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index 3b05167..0d011ef 100644 (file)
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/pom.xml
@@ -3,6 +3,7 @@
   performance
   ================================================================================
   Copyright (C) 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.
@@ -21,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.drools-applications</groupId>
-        <artifactId>testsuites</artifactId>
+        <artifactId>drools-applications-testsuites</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
-    <artifactId>performance</artifactId>
+    <artifactId>drools-applications-performance</artifactId>
     <build>
         <plugins>
             <plugin>

diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 2a729df..99341a3 100644 (file)
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -4,6 +4,7 @@
   ================================================================================
   Copyright (C) 2018 Ericsson. All rights reserved.
   Modifications Copyright (C) 2018, 2020 AT&T. 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 @@
         <artifactId>drools-applications</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
-    <artifactId>testsuites</artifactId>
+    <artifactId>drools-applications-testsuites</artifactId>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/testsuites/stability/pom.xml b/testsuites/stability/pom.xml
index a0eff42..3eb97f2 100644 (file)
--- a/testsuites/stability/pom.xml
+++ b/testsuites/stability/pom.xml
@@ -3,6 +3,7 @@
   stability
   ================================================================================
   Copyright (C) 2018 Ericsson. 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.
@@ -21,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.drools-applications</groupId>
-        <artifactId>testsuites</artifactId>
+        <artifactId>drools-applications-testsuites</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
-    <artifactId>stability</artifactId>
+    <artifactId>drools-applications-stability</artifactId>
     <build>
         <plugins>
             <plugin>