From: Toine Siebelink <toine.siebelink@est.tech>
Date: Tue, 5 Dec 2023 18:13:42 +0000 (+0000)
Subject: Merge "CSIT for trust level epic"
X-Git-Tag: 3.4.1~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9cbbe2508ee9ab443b710105cfc57e60bf6a3b02;hp=74d7d7d79dae6f376b619eddf55f350d3a70bacf;p=cps.git

Merge "CSIT for trust level epic"
---

diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index beb4de145..0e76d7e31 100755
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -125,7 +125,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.dataformat</groupId>
                 <artifactId>jackson-dataformat-xml</artifactId>
-                <version>2.13.1</version>
+                <version>2.13.5</version>
             </dependency>
             <dependency>
                 <groupId>com.github.spotbugs</groupId>
@@ -168,7 +168,7 @@
             <dependency>
                 <groupId>io.gsonfire</groupId>
                 <artifactId>gson-fire</artifactId>
-                <version>1.8.5</version>
+                <version>1.9.0</version>
             </dependency>
             <dependency>
                 <groupId>io.hypersistence</groupId>
@@ -218,7 +218,7 @@
             <dependency>
                 <groupId>org.codehaus.janino</groupId>
                 <artifactId>janino</artifactId>
-                <version>3.1.7</version>
+                <version>3.1.10</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.groovy</groupId>
@@ -248,7 +248,7 @@
             <dependency>
                 <groupId>org.liquibase</groupId>
                 <artifactId>liquibase-core</artifactId>
-                <version>4.16.0</version>
+                <version>4.21.0</version>
             </dependency>
             <dependency>
                 <groupId>org.mapstruct</groupId>
@@ -268,7 +268,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>8.0.6</version>
+                <version>8.0.10</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/docs/ncmp-cmhandle-querying.rst b/docs/ncmp-cmhandle-querying.rst
index 9b54aafae..529297daa 100644
--- a/docs/ncmp-cmhandle-querying.rst
+++ b/docs/ncmp-cmhandle-querying.rst
@@ -1,6 +1,6 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
-.. Copyright (C) 2022 Nordix Foundation
+.. Copyright (C) 2022-2023 Nordix Foundation
 
 .. DO NOT CHANGE THIS LABEL FOR RELEASE NOTES - EVEN THOUGH IT GIVES A WARNING
 .. _cmhandlequerying:
@@ -83,6 +83,14 @@ Request Body example using all available query criteria. This query would return
               "cpsPath": "//state[@cm-handle-state='ADVISED']"
             }
           ]
+        },
+        {
+          "conditionName": "cmHandleWithTrustLevel",
+          "conditionParameters": [
+            {
+              "trustLevel": "COMPLETE"
+            }
+          ]
         }
       ]
     }
@@ -159,3 +167,23 @@ The *cmHandleWithCpsPath* condition allows any data of the CM Handle to be queri
         }
       ]
     }
+
+CM Handle with Trust Level
+--------------------------
+
+With the *cmHandleWithTrustLevel* condition, we can provide just one trust level. The CM handles returned will have this trust level. Providing more than one parameter causes unexpected results. Condition parameter name is not being validated.
+
+.. code-block:: json
+
+    {
+      "cmHandleQueryParameters": [
+        {
+          "conditionName": "cmHandleWithTrustLevel",
+          "conditionParameters": [
+            {
+              "trustLevel": "COMPLETE"
+            }
+          ]
+        }
+      ]
+    }
\ No newline at end of file
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index fbf4b34d1..8bdc3fc9a 100755
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -42,6 +42,7 @@ Bug Fixes
 Features
 --------
     - CPS-Temporal is no longer supported and any related documentation has been removed.
+    - `CPS-1980 <https://jira.onap.org/browse/CPS-1980>`_ Exposing health and cluster metrics for hazelcast.
 
 
 Version: 3.4.0