Remove apex-pdp unused core modules

This is the final review in the refactoring of the model code in
apex-pdp.

The core-messaging and core-infrastructure modules are unused in
apex-pdp except for websocket communication. Websocket communication is
also not used in any deployment.

This review:
- removes the core-mesaging module, which had an apex-specific websocket
  implementation, except for the MessageException class, which is moved
  to the base core module
- removes the core-infrastructure module, except for the ThreadUtils
  class, which is moved to the base core module
- removes the websocket event protocol, which used core-messaging but is
  not used in any deployment
- collapses all three "core" submodules into a single module
- Updates dependencies where needed

Issue-ID: POLICY-1820
Change-Id: Ieae30063e99570e61943372d3fa23b77a211462c
Signed-off-by: liamfallon <liam.fallon@est.tech>

4 files changed, 8 insertions, 23 deletions

diff --git a/examples/examples-aadm/pom.xml b/examples/examples-aadm/pom.xml
index 5e8ba05f9..9d7fff4e7 100644
--- a/examples/examples-aadm/pom.xml
+++ b/examples/examples-aadm/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2022 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -37,13 +38,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.core</groupId>
-            <artifactId>core-engine</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.core</groupId>
-            <artifactId>core-infrastructure</artifactId>
+            <artifactId>core</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/examples/examples-adaptive/pom.xml b/examples/examples-adaptive/pom.xml
index 158710a52..694ad13e6 100644
--- a/examples/examples-adaptive/pom.xml
+++ b/examples/examples-adaptive/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2022 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -37,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.core</groupId>
-            <artifactId>core-engine</artifactId>
+            <artifactId>core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml
index 68dc69a86..a4b0d27c9 100644
--- a/examples/examples-myfirstpolicy/pom.xml
+++ b/examples/examples-myfirstpolicy/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2020 Nordix Foundation.
+   Modifications Copyright (C) 2020,2022 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -48,13 +48,7 @@
     </dependency>
     <dependency>
       <groupId>org.onap.policy.apex-pdp.core</groupId>
-      <artifactId>core-engine</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.apex-pdp.core</groupId>
-      <artifactId>core-infrastructure</artifactId>
+      <artifactId>core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/examples/examples-pcvs/pom.xml b/examples/examples-pcvs/pom.xml
index b3af036ba..ed6a2264b 100644
--- a/examples/examples-pcvs/pom.xml
+++ b/examples/examples-pcvs/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2020 Nordix Foundation.
+   Modifications Copyright (C) 2020,2022 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -49,16 +49,11 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.core</groupId>
-            <artifactId>core-engine</artifactId>
+            <artifactId>core</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.apex-pdp.core</groupId>
-            <artifactId>core-infrastructure</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.onap.policy.apex-pdp.auth</groupId>
             <artifactId>cli-editor</artifactId>
             <version>${project.version}</version>