Bump apex master to 2.4.0

Issue-ID: POLICY-2514
Change-Id: I764cfe41ed8cf8ffebd4ff076d0b76b79d61e142
Signed-off-by: RossC <ross.carter@est.tech>

88 files changed, 89 insertions, 89 deletions

diff --git a/auth/cli-codegen/pom.xml b/auth/cli-codegen/pom.xml
index 57fc0c5f4..dcf24bb8a 100644
--- a/auth/cli-codegen/pom.xml
+++ b/auth/cli-codegen/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.auth</groupId>
         <artifactId>auth</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cli-codegen</artifactId>
diff --git a/auth/cli-editor/pom.xml b/auth/cli-editor/pom.xml
index 9eca38fed..011c741d7 100644
--- a/auth/cli-editor/pom.xml
+++ b/auth/cli-editor/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.auth</groupId>
         <artifactId>auth</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cli-editor</artifactId>
diff --git a/auth/pom.xml b/auth/pom.xml
index 341657734..73d7460db 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.auth</groupId>
diff --git a/client/client-common/pom.xml b/client/client-common/pom.xml
index 173b419be..8ba6a03dc 100644
--- a/client/client-common/pom.xml
+++ b/client/client-common/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.client</groupId>
         <artifactId>apex-client</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apex-client-common</artifactId>
diff --git a/client/client-deployment/pom.xml b/client/client-deployment/pom.xml
index dac0df90b..b352a05f3 100644
--- a/client/client-deployment/pom.xml
+++ b/client/client-deployment/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.client</groupId>
         <artifactId>apex-client</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apex-client-deployment</artifactId>
diff --git a/client/client-editor/pom.xml b/client/client-editor/pom.xml
index 2572eaa75..4057969ad 100644
--- a/client/client-editor/pom.xml
+++ b/client/client-editor/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.client</groupId>
         <artifactId>apex-client</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apex-client-editor</artifactId>
diff --git a/client/client-full/pom.xml b/client/client-full/pom.xml
index 70bd7503a..2d303a7f2 100644
--- a/client/client-full/pom.xml
+++ b/client/client-full/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.client</groupId>
         <artifactId>apex-client</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apex-client-full</artifactId>
diff --git a/client/client-monitoring/pom.xml b/client/client-monitoring/pom.xml
index 6609eebaf..85b7f01f2 100644
--- a/client/client-monitoring/pom.xml
+++ b/client/client-monitoring/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.client</groupId>
         <artifactId>apex-client</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apex-client-monitoring</artifactId>
diff --git a/client/pom.xml b/client/pom.xml
index 05356da8e..30dac8203 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.client</groupId>
diff --git a/context/context-management/pom.xml b/context/context-management/pom.xml
index 713e2912c..3c4486206 100644
--- a/context/context-management/pom.xml
+++ b/context/context-management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.context</groupId>
         <artifactId>context</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>context-management</artifactId>
diff --git a/context/pom.xml b/context/pom.xml
index 2aa3c9e81..a6f21fe85 100644
--- a/context/pom.xml
+++ b/context/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.context</groupId>
diff --git a/core/core-deployment/pom.xml b/core/core-deployment/pom.xml
index 31c70d37c..aa93a0333 100644
--- a/core/core-deployment/pom.xml
+++ b/core/core-deployment/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.core</groupId>
         <artifactId>core</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>core-deployment</artifactId>
diff --git a/core/core-engine/pom.xml b/core/core-engine/pom.xml
index 88f5cfced..e17a36cb7 100644
--- a/core/core-engine/pom.xml
+++ b/core/core-engine/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.core</groupId>
         <artifactId>core</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>core-engine</artifactId>
diff --git a/core/core-infrastructure/pom.xml b/core/core-infrastructure/pom.xml
index e7fb816b1..ae8740fba 100644
--- a/core/core-infrastructure/pom.xml
+++ b/core/core-infrastructure/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.core</groupId>
         <artifactId>core</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>core-infrastructure</artifactId>
diff --git a/core/core-protocols/pom.xml b/core/core-protocols/pom.xml
index 392ea3eb4..43b64c202 100644
--- a/core/core-protocols/pom.xml
+++ b/core/core-protocols/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.core</groupId>
         <artifactId>core</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>core-protocols</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 56f31c434..2018b5d27 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.core</groupId>
diff --git a/examples/examples-aadm/pom.xml b/examples/examples-aadm/pom.xml
index 478e3d71e..333802471 100644
--- a/examples/examples-aadm/pom.xml
+++ b/examples/examples-aadm/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-aadm</artifactId>
diff --git a/examples/examples-adaptive/pom.xml b/examples/examples-adaptive/pom.xml
index 962a2c90a..2653bb081 100644
--- a/examples/examples-adaptive/pom.xml
+++ b/examples/examples-adaptive/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-adaptive</artifactId>
diff --git a/examples/examples-decisionmaker/pom.xml b/examples/examples-decisionmaker/pom.xml
index 7c4af5c05..279dbd50c 100644
--- a/examples/examples-decisionmaker/pom.xml
+++ b/examples/examples-decisionmaker/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-decisionmaker</artifactId>
diff --git a/examples/examples-grpc/pom.xml b/examples/examples-grpc/pom.xml
index 01dc7dd1c..c3d25d35d 100644
--- a/examples/examples-grpc/pom.xml
+++ b/examples/examples-grpc/pom.xml
@@ -24,7 +24,7 @@
    <parent>
       <groupId>org.onap.policy.apex-pdp.examples</groupId>
       <artifactId>examples</artifactId>
-      <version>2.3.3-SNAPSHOT</version>
+      <version>2.4.0-SNAPSHOT</version>
    </parent>
    <artifactId>examples-grpc</artifactId>
    <name>examples-grpc</name>
diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml
index 568c207f9..9be6be74a 100644
--- a/examples/examples-myfirstpolicy/pom.xml
+++ b/examples/examples-myfirstpolicy/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.policy.apex-pdp.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>2.3.3-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>examples-myfirstpolicy</artifactId>
diff --git a/examples/examples-onap-bbs/pom.xml b/examples/examples-onap-bbs/pom.xml
index bd8d8834d..ca82d6af7 100644
--- a/examples/examples-onap-bbs/pom.xml
+++ b/examples/examples-onap-bbs/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-onap-bbs</artifactId>
diff --git a/examples/examples-onap-vcpe/pom.xml b/examples/examples-onap-vcpe/pom.xml
index 2bd41954a..172773627 100644
--- a/examples/examples-onap-vcpe/pom.xml
+++ b/examples/examples-onap-vcpe/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-onap-vcpe</artifactId>
diff --git a/examples/examples-pcvs/pom.xml b/examples/examples-pcvs/pom.xml
index 0814df243..e62056e3a 100644
--- a/examples/examples-pcvs/pom.xml
+++ b/examples/examples-pcvs/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-pcvs</artifactId>
diff --git a/examples/examples-periodic/pom.xml b/examples/examples-periodic/pom.xml
index ef7b9c99f..b3528f5c4 100644
--- a/examples/examples-periodic/pom.xml
+++ b/examples/examples-periodic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-periodic</artifactId>
diff --git a/examples/examples-servlet/pom.xml b/examples/examples-servlet/pom.xml
index e04ccc407..0f6a49275 100644
--- a/examples/examples-servlet/pom.xml
+++ b/examples/examples-servlet/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-servlet</artifactId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 18a0b2046..b457a7ec9 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.examples</groupId>
diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml
index 9f70ebc44..aaeb51d36 100644
--- a/model/basic-model/pom.xml
+++ b/model/basic-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.model</groupId>
         <artifactId>model</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>basic-model</artifactId>
diff --git a/model/context-model/pom.xml b/model/context-model/pom.xml
index 8f75b1562..93cc466fc 100644
--- a/model/context-model/pom.xml
+++ b/model/context-model/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.model</groupId>
         <artifactId>model</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>context-model</artifactId>
diff --git a/model/engine-model/pom.xml b/model/engine-model/pom.xml
index c0e32b5d6..de1de9bae 100644
--- a/model/engine-model/pom.xml
+++ b/model/engine-model/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.model</groupId>
         <artifactId>model</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>engine-model</artifactId>
diff --git a/model/event-model/pom.xml b/model/event-model/pom.xml
index 089992dab..14a58d937 100644
--- a/model/event-model/pom.xml
+++ b/model/event-model/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.model</groupId>
         <artifactId>model</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>event-model</artifactId>
diff --git a/model/model-api/pom.xml b/model/model-api/pom.xml
index 376595de7..aa41cd656 100644
--- a/model/model-api/pom.xml
+++ b/model/model-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.model</groupId>
         <artifactId>model</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>model-api</artifactId>
diff --git a/model/policy-model/pom.xml b/model/policy-model/pom.xml
index 46d232229..34cc85a33 100644
--- a/model/policy-model/pom.xml
+++ b/model/policy-model/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.model</groupId>
         <artifactId>model</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-model</artifactId>
diff --git a/model/pom.xml b/model/pom.xml
index 4ca52a537..6312584ec 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.model</groupId>
diff --git a/model/utilities/pom.xml b/model/utilities/pom.xml
index f72707011..1bb260589 100644
--- a/model/utilities/pom.xml
+++ b/model/utilities/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.model</groupId>
         <artifactId>model</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>utilities</artifactId>
 
diff --git a/packages/apex-pdp-docker/pom.xml b/packages/apex-pdp-docker/pom.xml
index 6d2ca8ddd..295ff95ee 100644
--- a/packages/apex-pdp-docker/pom.xml
+++ b/packages/apex-pdp-docker/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.packages</groupId>
         <artifactId>apex-packages</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apex-pdp-docker</artifactId>
diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index e8b4d10af..da88664aa 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.packages</groupId>
         <artifactId>apex-packages</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apex-pdp-package-full</artifactId>
diff --git a/packages/pom.xml b/packages/pom.xml
index f2b691996..12502c4a1 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.packages</groupId>
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
index 070408f40..ab1dd9b7e 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
         <artifactId>plugins-context-distribution</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-context-distribution-hazelcast</artifactId>
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
index 3a90b5611..38efd6b28 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
         <artifactId>plugins-context-distribution</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-context-distribution-infinispan</artifactId>
diff --git a/plugins/plugins-context/plugins-context-distribution/pom.xml b/plugins/plugins-context/plugins-context-distribution/pom.xml
index 73efa2013..b5652c900 100644
--- a/plugins/plugins-context/plugins-context-distribution/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
         <artifactId>plugins-context</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
index 8049bbbec..4ba2d613d 100644
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
         <artifactId>plugins-context-locking</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-context-locking-curator</artifactId>
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
index 506570ce9..b9ec0c115 100644
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
         <artifactId>plugins-context-locking</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-context-locking-hazelcast</artifactId>
diff --git a/plugins/plugins-context/plugins-context-locking/pom.xml b/plugins/plugins-context/plugins-context-locking/pom.xml
index 473c9fcd3..e0e01527c 100644
--- a/plugins/plugins-context/plugins-context-locking/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
         <artifactId>plugins-context</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
diff --git a/plugins/plugins-context/plugins-context-persistence/pom.xml b/plugins/plugins-context/plugins-context-persistence/pom.xml
index eca92e66a..0f00cf8b4 100644
--- a/plugins/plugins-context/plugins-context-persistence/pom.xml
+++ b/plugins/plugins-context/plugins-context-persistence/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
         <artifactId>plugins-context</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-persistence</groupId>
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
index 9bc1d2f73..e1a6aac5f 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
         <artifactId>plugins-context-schema</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-context-schema-avro</artifactId>
diff --git a/plugins/plugins-context/plugins-context-schema/pom.xml b/plugins/plugins-context/plugins-context-schema/pom.xml
index 2330659c2..8cb4f4fd5 100644
--- a/plugins/plugins-context/plugins-context-schema/pom.xml
+++ b/plugins/plugins-context/plugins-context-schema/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
         <artifactId>plugins-context</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
diff --git a/plugins/plugins-context/pom.xml b/plugins/plugins-context/pom.xml
index 40fdc46e7..234ceb7d2 100644
--- a/plugins/plugins-context/pom.xml
+++ b/plugins/plugins-context/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml
index a796dbf21..ec62303ed 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml
@@ -26,7 +26,7 @@
  <parent>
   <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
   <artifactId>plugins-event-carrier</artifactId>
-  <version>2.3.3-SNAPSHOT</version>
+  <version>2.4.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>plugins-event-carrier-grpc</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml
index e210ead33..4aa0b4967 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-carrier-jms</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
index 050cbbac0..381510e8e 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-carrier-kafka</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml
index 1fdaacb70..0ef0cfe73 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-carrier-restclient</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
index 98f776a7a..b70760174 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-carrier-restrequestor</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml
index 17e3b469e..ebd6faa18 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-carrier-restserver</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml
index 6e4ed6e87..ac155911b 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-carrier-websocket</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/pom.xml b/plugins/plugins-event/plugins-event-carrier/pom.xml
index 8c163166c..ce55984f0 100644
--- a/plugins/plugins-event/plugins-event-carrier/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event</groupId>
         <artifactId>plugins-event</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml
index b5c678c5d..d6b8c2a7b 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
         <artifactId>plugins-event-protocol</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-protocol-jms</artifactId>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
index 7f32b08e6..651bd1ec5 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
         <artifactId>plugins-event-protocol</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-protocol-xml</artifactId>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
index b38b463b5..cd40dd181 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
         <artifactId>plugins-event-protocol</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-protocol-yaml</artifactId>
diff --git a/plugins/plugins-event/plugins-event-protocol/pom.xml b/plugins/plugins-event/plugins-event-protocol/pom.xml
index ce3e0bb43..4a972de9e 100644
--- a/plugins/plugins-event/plugins-event-protocol/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event</groupId>
         <artifactId>plugins-event</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
diff --git a/plugins/plugins-event/pom.xml b/plugins/plugins-event/pom.xml
index 40007cf30..2c73e08fc 100644
--- a/plugins/plugins-event/pom.xml
+++ b/plugins/plugins-event/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-event</groupId>
diff --git a/plugins/plugins-executor/plugins-executor-java/pom.xml b/plugins/plugins-executor/plugins-executor-java/pom.xml
index 8fe678a69..243988075 100644
--- a/plugins/plugins-executor/plugins-executor-java/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
         <artifactId>plugins-executor</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-executor-java</artifactId>
diff --git a/plugins/plugins-executor/plugins-executor-javascript/pom.xml b/plugins/plugins-executor/plugins-executor-javascript/pom.xml
index 21b41bd59..e97803363 100644
--- a/plugins/plugins-executor/plugins-executor-javascript/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-javascript/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
         <artifactId>plugins-executor</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-executor-javascript</artifactId>
diff --git a/plugins/plugins-executor/plugins-executor-jruby/pom.xml b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
index 848783b71..3dd93621c 100644
--- a/plugins/plugins-executor/plugins-executor-jruby/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
         <artifactId>plugins-executor</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-executor-jruby</artifactId>
diff --git a/plugins/plugins-executor/plugins-executor-mvel/pom.xml b/plugins/plugins-executor/plugins-executor-mvel/pom.xml
index 9c036caa2..26c2e1a77 100644
--- a/plugins/plugins-executor/plugins-executor-mvel/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-mvel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
         <artifactId>plugins-executor</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-executor-mvel</artifactId>
diff --git a/plugins/plugins-executor/pom.xml b/plugins/plugins-executor/pom.xml
index ad65d7f71..ac68ab5f8 100644
--- a/plugins/plugins-executor/pom.xml
+++ b/plugins/plugins-executor/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml
index 992fa8ffd..e49ad6dc9 100644
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml
+++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence.plugins-persistence-jpa</groupId>
         <artifactId>plugins-persistence-jpa</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>plugins-persistence-jpa-eclipselink</artifactId>
     <name>${project.artifactId}</name>
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml
index 33dabfca2..3866f5711 100644
--- a/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml
+++ b/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence</groupId>
         <artifactId>plugins-persistence</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence.plugins-persistence-jpa</groupId>
diff --git a/plugins/plugins-persistence/pom.xml b/plugins/plugins-persistence/pom.xml
index 9a47766de..5b903c3cb 100644
--- a/plugins/plugins-persistence/pom.xml
+++ b/plugins/plugins-persistence/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence</groupId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 1ab4335d2..c1990080d 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 9bb70104a..2759e1d60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 
     <groupId>org.onap.policy.apex-pdp</groupId>
     <artifactId>apex-pdp</artifactId>
-    <version>2.3.3-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>policy-apex-pdp</name>
diff --git a/services/pom.xml b/services/pom.xml
index 8303ee1dc..7851693c2 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.services</groupId>
diff --git a/services/services-engine/pom.xml b/services/services-engine/pom.xml
index 7d71f2210..0ba012952 100644
--- a/services/services-engine/pom.xml
+++ b/services/services-engine/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.services</groupId>
         <artifactId>services</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>services-engine</artifactId>
diff --git a/services/services-onappf/pom.xml b/services/services-onappf/pom.xml
index eccdbbce2..bc446c46a 100644
--- a/services/services-onappf/pom.xml
+++ b/services/services-onappf/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.services</groupId>
         <artifactId>services</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>services-onappf</artifactId>
diff --git a/testsuites/apex-pdp-stability/pom.xml b/testsuites/apex-pdp-stability/pom.xml
index 72d900cd8..1a9613450 100644
--- a/testsuites/apex-pdp-stability/pom.xml
+++ b/testsuites/apex-pdp-stability/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites</groupId>
         <artifactId>apex-testsuites</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.testsuites.stability</groupId>
diff --git a/testsuites/integration/integration-common/pom.xml b/testsuites/integration/integration-common/pom.xml
index 2e09b9054..c77536981 100644
--- a/testsuites/integration/integration-common/pom.xml
+++ b/testsuites/integration/integration-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
         <artifactId>apex-integration</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>integration-common</artifactId>
 
diff --git a/testsuites/integration/integration-context-test/pom.xml b/testsuites/integration/integration-context-test/pom.xml
index 5c329d04c..0cd1ae35a 100644
--- a/testsuites/integration/integration-context-test/pom.xml
+++ b/testsuites/integration/integration-context-test/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
         <artifactId>apex-integration</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>integration-context-test</artifactId>
diff --git a/testsuites/integration/integration-executor-test/pom.xml b/testsuites/integration/integration-executor-test/pom.xml
index 89269141d..0ab27328e 100644
--- a/testsuites/integration/integration-executor-test/pom.xml
+++ b/testsuites/integration/integration-executor-test/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
         <artifactId>apex-integration</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>integration-executor-test</artifactId>
diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml
index 8a7500ae8..fc47df3b6 100644
--- a/testsuites/integration/integration-uservice-test/pom.xml
+++ b/testsuites/integration/integration-uservice-test/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
         <artifactId>apex-integration</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>integration-uservice-test</artifactId>
diff --git a/testsuites/integration/pom.xml b/testsuites/integration/pom.xml
index 6d7981011..685f8e1f9 100644
--- a/testsuites/integration/pom.xml
+++ b/testsuites/integration/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites</groupId>
         <artifactId>apex-testsuites</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
diff --git a/testsuites/performance/performance-benchmark-test/pom.xml b/testsuites/performance/performance-benchmark-test/pom.xml
index 476c91d5e..d97bc06cd 100644
--- a/testsuites/performance/performance-benchmark-test/pom.xml
+++ b/testsuites/performance/performance-benchmark-test/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId>
         <artifactId>apex-performance</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>performance-benchmark-test</artifactId>
diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index 439caa57c..2b38efc9b 100644
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites</groupId>
         <artifactId>apex-testsuites</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 0d5143f05..c00ff3a87 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.testsuites</groupId>
diff --git a/tools/model-generator/pom.xml b/tools/model-generator/pom.xml
index 9c1793c48..166251397 100644
--- a/tools/model-generator/pom.xml
+++ b/tools/model-generator/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.tools</groupId>
         <artifactId>tools</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>model-generator</artifactId>
diff --git a/tools/pom.xml b/tools/pom.xml
index 3b98da9a4..62eb455b0 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.tools</groupId>
diff --git a/tools/simple-wsclient/pom.xml b/tools/simple-wsclient/pom.xml
index 4947dd745..072a396f2 100644
--- a/tools/simple-wsclient/pom.xml
+++ b/tools/simple-wsclient/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.tools</groupId>
         <artifactId>tools</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>simple-wsclient</artifactId>
diff --git a/tools/tools-common/pom.xml b/tools/tools-common/pom.xml
index d2a8320d8..d664d4cfb 100644
--- a/tools/tools-common/pom.xml
+++ b/tools/tools-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.tools</groupId>
         <artifactId>tools</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>tools-common</artifactId>
diff --git a/version.properties b/version.properties
index 7307096ba..ee5d4d0e3 100644
--- a/version.properties
+++ b/version.properties
@@ -3,8 +3,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=2
-minor=3
-patch=3
+minor=4
+patch=0
 
 base_version=${major}.${minor}.${patch}