summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/client-common/pom.xml5
-rw-r--r--client/client-deployment/pom.xml9
-rw-r--r--client/client-editor/pom.xml9
-rw-r--r--client/client-full/pom.xml19
-rw-r--r--client/client-monitoring/pom.xml9
-rw-r--r--client/pom.xml3
-rw-r--r--packages/apex-pdp-docker/pom.xml4
-rw-r--r--packages/apex-pdp-package-full/pom.xml20
-rw-r--r--packages/pom.xml4
-rw-r--r--testsuites/apex-pdp-stability/pom.xml3
-rw-r--r--testsuites/integration/pom.xml5
-rw-r--r--testsuites/performance/pom.xml5
-rw-r--r--testsuites/pom.xml3
13 files changed, 54 insertions, 44 deletions
diff --git a/client/client-common/pom.xml b/client/client-common/pom.xml
index b8013ca88..fe7c93632 100644
--- a/client/client-common/pom.xml
+++ b/client/client-common/pom.xml
@@ -1,6 +1,7 @@
<!--
============LICENSE_START=======================================================
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.
@@ -22,11 +23,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-common</artifactId>
+ <artifactId>apex-client-common</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
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>
diff --git a/client/client-editor/pom.xml b/client/client-editor/pom.xml
index 2577148fd..41d27adc1 100644
--- a/client/client-editor/pom.xml
+++ b/client/client-editor/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-editor</artifactId>
+ <artifactId>apex-client-editor</artifactId>
<name>${project.artifactId}</name>
<description>Web client for editing Apex policies</description>
@@ -74,7 +75,7 @@
</dependency>
<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>
@@ -102,7 +103,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>
diff --git a/client/client-full/pom.xml b/client/client-full/pom.xml
index 257d3d7e6..dd9d78cb7 100644
--- a/client/client-full/pom.xml
+++ b/client/client-full/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,33 +24,33 @@
<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-full</artifactId>
+ <artifactId>apex-client-full</artifactId>
<name>${project.artifactId}</name>
<description>Web clients for managing Apex engines</description>
<dependencies>
<dependency>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-editor</artifactId>
+ <artifactId>apex-client-editor</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-monitoring</artifactId>
+ <artifactId>apex-client-monitoring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-deployment</artifactId>
+ <artifactId>apex-client-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-monitoring</artifactId>
+ <artifactId>apex-client-monitoring</artifactId>
<version>${project.version}</version>
<classifier>resources</classifier>
<type>zip</type>
@@ -57,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-deployment</artifactId>
+ <artifactId>apex-client-deployment</artifactId>
<version>${project.version}</version>
<classifier>resources</classifier>
<type>zip</type>
@@ -65,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-editor</artifactId>
+ <artifactId>apex-client-editor</artifactId>
<version>${project.version}</version>
<classifier>resources</classifier>
<type>zip</type>
@@ -108,7 +109,7 @@
<outputDirectory>${project.build.directory}/classes/webapp</outputDirectory>
<!--use as much as needed to be specific...also scope,type,classifier etc-->
<includeGroupIds>org.onap.policy.apex-pdp.client</includeGroupIds>
- <includeArtifacIds>client-monitoring, client-deployment, client-editor</includeArtifacIds>
+ <includeArtifacIds>apex-client-monitoring, apex-client-deployment, apex-client-editor</includeArtifacIds>
<excludeTransitive>true</excludeTransitive>
<excludeTypes>jar</excludeTypes>
<includeTypes>zip</includeTypes>
diff --git a/client/client-monitoring/pom.xml b/client/client-monitoring/pom.xml
index 4e5eb0b3e..bd9893bef 100644
--- a/client/client-monitoring/pom.xml
+++ b/client/client-monitoring/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-monitoring</artifactId>
+ <artifactId>apex-client-monitoring</artifactId>
<name>${project.artifactId}</name>
<description>Web client for monitoring Apex engines</description>
@@ -57,7 +58,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>
@@ -85,7 +86,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>
<excludeTypes>jar</excludeTypes>
diff --git a/client/pom.xml b/client/pom.xml
index 03b7e0eed..21afba11d 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -1,6 +1,7 @@
<!--
============LICENSE_START=======================================================
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.
@@ -26,7 +27,7 @@
</parent>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client</artifactId>
+ <artifactId>apex-client</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
diff --git a/packages/apex-pdp-docker/pom.xml b/packages/apex-pdp-docker/pom.xml
index 25c27189a..6d21e1ca4 100644
--- a/packages/apex-pdp-docker/pom.xml
+++ b/packages/apex-pdp-docker/pom.xml
@@ -1,7 +1,7 @@
<!--
============LICENSE_START=======================================================
Copyright (C) 2018 Ericsson. 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.
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.apex-pdp.packages</groupId>
- <artifactId>packages</artifactId>
+ <artifactId>apex-packages</artifactId>
<version>2.3.0-SNAPSHOT</version>
</parent>
diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index b9b0613d6..daee292d8 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
Copyright (C) 2018 Ericsson. 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.
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.apex-pdp.packages</groupId>
- <artifactId>packages</artifactId>
+ <artifactId>apex-packages</artifactId>
<version>2.3.0-SNAPSHOT</version>
</parent>
@@ -50,25 +50,25 @@
<!-- Client Servlet applications -->
<dependency>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-full</artifactId>
+ <artifactId>apex-client-full</artifactId>
<type>war</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-editor</artifactId>
+ <artifactId>apex-client-editor</artifactId>
<type>war</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-deployment</artifactId>
+ <artifactId>apex-client-deployment</artifactId>
<type>war</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-monitoring</artifactId>
+ <artifactId>apex-client-monitoring</artifactId>
<type>war</type>
<version>${project.version}</version>
</dependency>
@@ -465,28 +465,28 @@
</artifactItem>
<artifactItem>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-monitoring</artifactId>
+ <artifactId>apex-client-monitoring</artifactId>
<version>${project.version}</version>
<classifier>monitoring</classifier>
<outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-editor</artifactId>
+ <artifactId>apex-client-editor</artifactId>
<version>${project.version}</version>
<classifier>editor</classifier>
<outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-deployment</artifactId>
+ <artifactId>apex-client-deployment</artifactId>
<version>${project.version}</version>
<classifier>deployment</classifier>
<outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>client-full</artifactId>
+ <artifactId>apex-client-full</artifactId>
<version>${project.version}</version>
<classifier>full</classifier>
<outputDirectory>${project.build.directory}/lib/applications</outputDirectory>
diff --git a/packages/pom.xml b/packages/pom.xml
index a90a4ae55..940eeb26d 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -1,7 +1,7 @@
<!--
============LICENSE_START=======================================================
Copyright (C) 2018 Ericsson. 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 @@
</parent>
<groupId>org.onap.policy.apex-pdp.packages</groupId>
- <artifactId>packages</artifactId>
+ <artifactId>apex-packages</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
diff --git a/testsuites/apex-pdp-stability/pom.xml b/testsuites/apex-pdp-stability/pom.xml
index 25ddfc692..5ca015637 100644
--- a/testsuites/apex-pdp-stability/pom.xml
+++ b/testsuites/apex-pdp-stability/pom.xml
@@ -1,6 +1,7 @@
<!--
============LICENSE_START=======================================================
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.
@@ -23,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.apex-pdp.testsuites</groupId>
- <artifactId>testsuites</artifactId>
+ <artifactId>apex-testsuites</artifactId>
<version>2.3.0-SNAPSHOT</version>
</parent>
diff --git a/testsuites/integration/pom.xml b/testsuites/integration/pom.xml
index 5aa569c6c..8ec0d387c 100644
--- a/testsuites/integration/pom.xml
+++ b/testsuites/integration/pom.xml
@@ -2,6 +2,7 @@
============LICENSE_START=======================================================
Copyright (C) 2018 Ericsson. All rights reserved.
Modifications Copyright (C) 2019-2020 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,12 +24,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.apex-pdp.testsuites</groupId>
- <artifactId>testsuites</artifactId>
+ <artifactId>apex-testsuites</artifactId>
<version>2.3.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
- <artifactId>integration</artifactId>
+ <artifactId>apex-integration</artifactId>
<packaging>pom</packaging>
<modules>
diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index 380501318..dcfaf8c32 100644
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/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,12 +24,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.apex-pdp.testsuites</groupId>
- <artifactId>testsuites</artifactId>
+ <artifactId>apex-testsuites</artifactId>
<version>2.3.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId>
- <artifactId>performance</artifactId>
+ <artifactId>apex-performance</artifactId>
<packaging>pom</packaging>
<profiles>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 5aa547ba1..ab95b745b 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -1,6 +1,7 @@
<!--
============LICENSE_START=======================================================
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.
@@ -26,7 +27,7 @@
</parent>
<groupId>org.onap.policy.apex-pdp.testsuites</groupId>
- <artifactId>testsuites</artifactId>
+ <artifactId>apex-testsuites</artifactId>
<packaging>pom</packaging>
<modules>