Merge "Increase code coverage"

diff --git a/auth/cli-codegen/pom.xml b/auth/cli-codegen/pom.xml
index d934e49..9df355a 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cli-codegen</artifactId>

diff --git a/auth/cli-editor/pom.xml b/auth/cli-editor/pom.xml
index 9492278..e1a2b27 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cli-editor</artifactId>

diff --git a/auth/pom.xml b/auth/pom.xml
index 3654518..573ac3b 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.auth</groupId>

diff --git a/context/context-management/pom.xml b/context/context-management/pom.xml
index 11e058c..0b9feb0 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>context-management</artifactId>

diff --git a/context/pom.xml b/context/pom.xml
index 6707a7d..e74f79c 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.context</groupId>

diff --git a/core/core-engine/pom.xml b/core/core-engine/pom.xml
index ecc804a..e574684 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>core-engine</artifactId>

diff --git a/core/core-infrastructure/pom.xml b/core/core-infrastructure/pom.xml
index cb8fe90..6e85e33 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>core-infrastructure</artifactId>

diff --git a/core/core-protocols/pom.xml b/core/core-protocols/pom.xml
index 8acda4d..32d1483 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>core-protocols</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
index 5a0d86d..2b58ef9 100644 (file)
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.6.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 8b4ac40..94c9659 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-aadm</artifactId>

diff --git a/examples/examples-adaptive/pom.xml b/examples/examples-adaptive/pom.xml
index c16e51d..704bd3c 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-adaptive</artifactId>

diff --git a/examples/examples-decisionmaker/pom.xml b/examples/examples-decisionmaker/pom.xml
index b480537..c45a365 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-decisionmaker</artifactId>

diff --git a/examples/examples-grpc/pom.xml b/examples/examples-grpc/pom.xml
index 84d6895..3473e2c 100644 (file)
--- a/examples/examples-grpc/pom.xml
+++ b/examples/examples-grpc/pom.xml
@@ -25,7 +25,7 @@
    <parent>
       <groupId>org.onap.policy.apex-pdp.examples</groupId>
       <artifactId>examples</artifactId>
-      <version>2.5.1-SNAPSHOT</version>
+      <version>2.6.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 02dbf8d..fce2be5 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+    <version>2.6.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 46d5c23..dc24b3a 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 7b8b4d8..95981d5 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-onap-vcpe</artifactId>

diff --git a/examples/examples-pcvs/pom.xml b/examples/examples-pcvs/pom.xml
index 73b28b1..d6171a4 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-pcvs</artifactId>

diff --git a/examples/examples-periodic/pom.xml b/examples/examples-periodic/pom.xml
index 94fcadb..67e94e0 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-periodic</artifactId>

diff --git a/examples/examples-servlet/pom.xml b/examples/examples-servlet/pom.xml
index a1010c0..d49ff34 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-servlet</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
index 4e7969f..d308eb8 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 031ce06..5ff5c75 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>basic-model</artifactId>

diff --git a/model/context-model/pom.xml b/model/context-model/pom.xml
index 5c78316..6ab2eec 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>context-model</artifactId>

diff --git a/model/engine-model/pom.xml b/model/engine-model/pom.xml
index c3fa57a..1ee709b 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>engine-model</artifactId>

diff --git a/model/event-model/pom.xml b/model/event-model/pom.xml
index bd1325a..17aa140 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>event-model</artifactId>

diff --git a/model/model-api/pom.xml b/model/model-api/pom.xml
index e451452..251a2ee 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>model-api</artifactId>

diff --git a/model/policy-model/pom.xml b/model/policy-model/pom.xml
index b915eac..5c1ad4d 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-model</artifactId>

diff --git a/model/pom.xml b/model/pom.xml
index b34e540..ebca71e 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 770ba17..add617b 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>utilities</artifactId>
 

diff --git a/packages/apex-pdp-docker/pom.xml b/packages/apex-pdp-docker/pom.xml
index 995e031..0e19758 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 3bf95dd..6744c49 100644 (file)
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.packages</groupId>
         <artifactId>apex-packages</artifactId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apex-pdp-package-full</artifactId>

diff --git a/packages/apex-pdp-package-full/src/main/resources/ssl/policy-keystore b/packages/apex-pdp-package-full/src/main/resources/ssl/policy-keystore
index 6ba2533..b95e010 100644 (file)
Binary files a/packages/apex-pdp-package-full/src/main/resources/ssl/policy-keystore and b/packages/apex-pdp-package-full/src/main/resources/ssl/policy-keystore differ

diff --git a/packages/pom.xml b/packages/pom.xml
index 45925cd..6474963 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 1c83a83..03e7e25 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 d22a3f5..aaa5360 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 6b9e104..bb5f1f2 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 e6bf7c6..e51b351 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 28d149e..20c8899 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 30b81c1..88fd302 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 c059bcc..1dd0f2c 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 ad4ab5c..1789275 100644 (file)
--- 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
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
         <artifactId>plugins-context-schema</artifactId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.6.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 dad5583..64d5223 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 b9df1b3..3ff982d 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 5a631c5..6dd3323 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+  <version>2.6.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 d368c02..ce1bcd8 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 8b891aa..7d83167 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 a142bd1..f11bd41 100644 (file)
--- 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
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.6.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 72184ef..0bf9921 100644 (file)
--- 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
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.6.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 912fdfc..86e2be5 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 71eb45c..3207faf 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 d7d4747..2c83b4e 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 2caf18a..d9f800e 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 b12606b..a467304 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-protocol-xml</artifactId>

diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventHandlerTest.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventHandlerTest.java
index caa3bd0..609b047 100644 (file)
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventHandlerTest.java
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventHandlerTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020-2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,9 +29,13 @@ import static org.junit.Assert.assertTrue;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Random;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.service.engine.event.ApexEvent;
+import org.onap.policy.apex.service.engine.event.ApexEventException;
+import org.onap.policy.apex.service.engine.event.ApexEventRuntimeException;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
@@ -43,6 +47,44 @@ import org.slf4j.ext.XLoggerFactory;
 public class XmlEventHandlerTest {
     private static final XLogger logger = XLoggerFactory.getXLogger(XmlEventHandlerTest.class);
 
+    /**
+     * Test XML to apex event. Null value is passed as parameter.
+     *
+     * @throws ApexException on Apex event handling errors
+     */
+    @Test(expected = ApexException.class)
+    public void testApexEventToApexNullObject() throws ApexException {
+        final Apex2XmlEventConverter xmlEventConverter = new Apex2XmlEventConverter();
+        // This is only for code coverage stats. This method does nothing
+        xmlEventConverter.init(null);
+
+        xmlEventConverter.toApexEvent("XMLEventName", null);
+    }
+
+    /**
+     * Test XML to apex event. There is no string passed as parameter.
+     *
+     * @throws ApexException on Apex event handling errors
+     */
+    @Test(expected = ApexEventRuntimeException.class)
+    public void testApexEventToApexNotString() throws ApexException {
+        final Apex2XmlEventConverter xmlEventConverter = new Apex2XmlEventConverter();
+
+        xmlEventConverter.toApexEvent("XMLEventName", new Random().nextInt());
+    }
+
+    /**
+     * Test not valid XML to apex event.
+     *
+     * @throws ApexException on Apex event handling errors
+     */
+    @Test(expected = ApexException.class)
+    public void testApexEventToApexNotXml() throws ApexException {
+        final Apex2XmlEventConverter xmlEventConverter = new Apex2XmlEventConverter();
+
+        xmlEventConverter.toApexEvent("XMLEventName", RandomStringUtils.randomAlphabetic(25));
+    }
+
     /**
      * Test XML to apex event.
      *
@@ -79,6 +121,17 @@ public class XmlEventHandlerTest {
         }
     }
 
+    /**
+     * Test null as apex event to xml.
+     *
+     * @throws ApexEventException on Apex event handling errors
+     */
+    @Test(expected = ApexEventException.class)
+    public void testApexEventToXmlNullEvent() throws ApexEventException {
+        final Apex2XmlEventConverter xmlEventConverter = new Apex2XmlEventConverter();
+        xmlEventConverter.fromApexEvent(null);
+    }
+
     /**
      * Test apex event to xml.
      *
@@ -96,6 +149,7 @@ public class XmlEventHandlerTest {
             event0000DataMap.put("TestMatchCase", 12345);
             event0000DataMap.put("TestTimestamp", event0000StartTime.getTime());
             event0000DataMap.put("TestTemperature", 34.5445667);
+            event0000DataMap.put("NullValue", null);
 
             final ApexEvent apexEvent0000 =
                     new ApexEvent("Event0000", "0.0.1", "org.onap.policy.apex.sample.events", "test", "apex");
@@ -109,6 +163,7 @@ public class XmlEventHandlerTest {
             assertTrue(apexEvent0000XmlString.contains("<version>0.0.1</version>"));
             assertTrue(apexEvent0000XmlString.contains("<value>This is a test slogan</value>"));
             assertTrue(apexEvent0000XmlString.contains("<value>12345</value>"));
+            assertTrue(apexEvent0000XmlString.contains("<value></value>"));
             assertTrue(apexEvent0000XmlString.contains("<value>" + event0000StartTime.getTime() + "</value>"));
             assertTrue(apexEvent0000XmlString.contains("<value>34.5445667</value>"));
 

diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParametersTest.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParametersTest.java
new file mode 100644 (file)
index 0000000..27fd220
--- /dev/null
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParametersTest.java
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.apex.plugins.event.protocol.xml;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class XmlEventProtocolParametersTest {
+
+    /**
+     * Test object creation.
+     */
+    @Test
+    public void instantiationTest() {
+        final XmlEventProtocolParameters parameters = new XmlEventProtocolParameters();
+
+        assertEquals(XmlEventProtocolParameters.XML_EVENT_PROTOCOL_LABEL, parameters.getLabel());
+        assertEquals("<?xml", parameters.getStartDelimiterToken());
+        assertEquals(Apex2XmlEventConverter.class.getName(), parameters.getEventProtocolPluginClass());
+    }
+}
\ No newline at end of file

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 eb92cf3..b438735 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 f2dbecb..054daa2 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 e8ee901..e375b54 100644 (file)
--- a/plugins/plugins-event/pom.xml
+++ b/plugins/plugins-event/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.6.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 6ffbcea..09f62eb 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 6feff7d..9861c4b 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 5774a45..92b42ef 100644 (file)
--- a/plugins/plugins-executor/plugins-executor-jruby/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
         <artifactId>plugins-executor</artifactId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.6.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 0a1d9f2..d900834 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-executor-mvel</artifactId>

diff --git a/plugins/plugins-executor/pom.xml b/plugins/plugins-executor/pom.xml
index 53441dc..a73a70a 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 74f8f6b..449173c 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 433583d..5fa2675 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 b5b01c3..8855b2d 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 aa3ad39..94f146b 100644 (file)
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins</groupId>

diff --git a/pom.xml b/pom.xml
index 3b606d6..9449d77 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 
     <groupId>org.onap.policy.apex-pdp</groupId>
     <artifactId>apex-pdp</artifactId>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>policy-apex-pdp</name>
@@ -46,7 +46,7 @@
         <version.kafka>2.3.0</version.kafka>
         <version.hibernate>5.3.7.Final</version.hibernate>
         <version.policy.common>1.8.0</version.policy.common>
-        <version.policy.models>2.4.0</version.policy.models>
+        <version.policy.models>2.4.1</version.policy.models>
         <version.jgroups>4.1.5.Final</version.jgroups>
         <version.commons-codec>20041127.091804</version.commons-codec>
         <version.caffeine>2.8.0</version.caffeine>

diff --git a/releases/2.5.1-container.yaml b/releases/2.5.1-container.yaml
new file mode 100644 (file)
index 0000000..fca666e
--- /dev/null
+++ b/releases/2.5.1-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '2.5.1'
+project: 'policy-apex-pdp'
+log_dir: 'policy-apex-pdp-maven-docker-stage-master/644/'
+ref: 7d012686a7b447acc5fc6b81994ef661c1066580
+containers:
+    - name: 'policy-apex-pdp'
+      version: '2.5.1-20210310T1027'

diff --git a/releases/2.5.1.yaml b/releases/2.5.1.yaml
new file mode 100644 (file)
index 0000000..98252ab
--- /dev/null
+++ b/releases/2.5.1.yaml
@@ -0,0 +1,5 @@
+distribution_type: 'maven'
+version: '2.5.1'
+project: 'policy-apex-pdp'
+tag_release: false
+log_dir: 'policy-apex-pdp-maven-stage-master/646/'
\ No newline at end of file

diff --git a/services/pom.xml b/services/pom.xml
index e38c2d3..deebbcb 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 5669ab3..dff9840 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>services-engine</artifactId>

diff --git a/services/services-onappf/pom.xml b/services/services-onappf/pom.xml
index ef9eebc..01e514b 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>services-onappf</artifactId>

diff --git a/services/services-onappf/src/test/resources/ssl/policy-keystore b/services/services-onappf/src/test/resources/ssl/policy-keystore
index 6ba2533..b95e010 100644 (file)
Binary files a/services/services-onappf/src/test/resources/ssl/policy-keystore and b/services/services-onappf/src/test/resources/ssl/policy-keystore differ

diff --git a/testsuites/apex-pdp-stability/pom.xml b/testsuites/apex-pdp-stability/pom.xml
index 8207c15..e0549de 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 f92c35f..f7679bb 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 743627c..0bbdad8 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 0e1ac1a..eb387dc 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 e5f6ba6..131876f 100644 (file)
--- a/testsuites/integration/integration-uservice-test/pom.xml
+++ b/testsuites/integration/integration-uservice-test/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
         <artifactId>apex-integration</artifactId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>integration-uservice-test</artifactId>

diff --git a/testsuites/integration/pom.xml b/testsuites/integration/pom.xml
index 9aab176..a07d831 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 3d8f973..9753431 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>performance-benchmark-test</artifactId>

diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index 494a2b5..e05d3ef 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId>

diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 9d48ca8..6298d5e 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 ad6e24b..c9a4648 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>model-generator</artifactId>

diff --git a/tools/pom.xml b/tools/pom.xml
index adc59f2..44bd94e 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.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 7f9e80a..ac52f17 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>simple-wsclient</artifactId>

diff --git a/tools/tools-common/pom.xml b/tools/tools-common/pom.xml
index b0dc92d..fa68b23 100644 (file)
--- 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.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>tools-common</artifactId>

diff --git a/version.properties b/version.properties
index 50c84cd..86a80a5 100644 (file)
--- 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=5
-patch=1
+minor=6
+patch=0
 
 base_version=${major}.${minor}.${patch}