Merge "Add DMI trustlevel at registration"

diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index c57fd00..f41f899 100644 (file)
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.cps</groupId>
     <artifactId>checkstyle</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.4.1-SNAPSHOT</version>
 
     <profiles>
         <profile>

diff --git a/cps-application/pom.xml b/cps-application/pom.xml
index 8af27ce..f989638 100755 (executable)
--- a/cps-application/pom.xml
+++ b/cps-application/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/cps-application/src/test/java/org/onap/cps/architecture/LayeredArchitectureTest.java b/cps-application/src/test/java/org/onap/cps/architecture/LayeredArchitectureTest.java
index 8448136..ec16cee 100644 (file)
--- a/cps-application/src/test/java/org/onap/cps/architecture/LayeredArchitectureTest.java
+++ b/cps-application/src/test/java/org/onap/cps/architecture/LayeredArchitectureTest.java
@@ -44,6 +44,7 @@ public class LayeredArchitectureTest {
     private static final String NOTIFICATION_PACKAGE = "org.onap.cps.notification..";
     private static final String CPS_UTILS_PACKAGE = "org.onap.cps.utils..";
     private static final String NCMP_INIT_PACKAGE = "org.onap.cps.ncmp.init..";
+    private static final String CPS_CACHE_PACKAGE = "org.onap.cps.cache..";
 
     @ArchTest
     static final ArchRule restControllerShouldOnlyDependOnRestController =
@@ -55,7 +56,9 @@ public class LayeredArchitectureTest {
         freeze(classes().that().resideInAPackage(API_SERVICE_PACKAGE)
             .or().resideInAPackage(SPI_SERVICE_PACKAGE).should().onlyHaveDependentClassesThat()
             .resideInAnyPackage(REST_CONTROLLER_PACKAGE, API_SERVICE_PACKAGE, SPI_SERVICE_PACKAGE, NCMP_REST_PACKAGE,
-                NCMP_SERVICE_PACKAGE, YANG_SCHEMA_PACKAGE, NOTIFICATION_PACKAGE, CPS_UTILS_PACKAGE, NCMP_INIT_PACKAGE));
+                NCMP_SERVICE_PACKAGE, YANG_SCHEMA_PACKAGE, NOTIFICATION_PACKAGE, CPS_UTILS_PACKAGE, NCMP_INIT_PACKAGE,
+                CPS_CACHE_PACKAGE));
+
 
     @ArchTest
     static final ArchRule repositoryShouldOnlyBeDependedOnByServicesAndRepository =

diff --git a/cps-bom/pom.xml b/cps-bom/pom.xml
index d45a589..ac6b460 100644 (file)
--- a/cps-bom/pom.xml
+++ b/cps-bom/pom.xml
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.cps</groupId>
     <artifactId>cps-bom</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <description>This artifact contains dependencyManagement declarations of all published CPS components.</description>

diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index 84d58a3..beb4de1 100755 (executable)
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.cps</groupId>
     <artifactId>cps-dependencies</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -150,7 +150,7 @@
             <dependency>
                 <groupId>com.tngtech.archunit</groupId>
                 <artifactId>archunit-junit5</artifactId>
-                <version>0.18.0</version>
+                <version>1.2.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

diff --git a/cps-events/pom.xml b/cps-events/pom.xml
index 8a56214..4b531c1 100644 (file)
--- a/cps-events/pom.xml
+++ b/cps-events/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/cps-ncmp-events/pom.xml b/cps-ncmp-events/pom.xml
index e52dc3b..8a8d4d8 100644 (file)
--- a/cps-ncmp-events/pom.xml
+++ b/cps-ncmp-events/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/cps-ncmp-rest-stub/cps-ncmp-rest-stub-app/pom.xml b/cps-ncmp-rest-stub/cps-ncmp-rest-stub-app/pom.xml
index 40f8b34..602df4f 100644 (file)
--- a/cps-ncmp-rest-stub/cps-ncmp-rest-stub-app/pom.xml
+++ b/cps-ncmp-rest-stub/cps-ncmp-rest-stub-app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-ncmp-rest-stub</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>cps-ncmp-rest-stub-app</artifactId>

diff --git a/cps-ncmp-rest-stub/cps-ncmp-rest-stub-service/pom.xml b/cps-ncmp-rest-stub/cps-ncmp-rest-stub-service/pom.xml
index f40d79e..126bdc7 100644 (file)
--- a/cps-ncmp-rest-stub/cps-ncmp-rest-stub-service/pom.xml
+++ b/cps-ncmp-rest-stub/cps-ncmp-rest-stub-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-ncmp-rest-stub</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>cps-ncmp-rest-stub-service</artifactId>
 

diff --git a/cps-ncmp-rest-stub/pom.xml b/cps-ncmp-rest-stub/pom.xml
index faf9559..26c95ab 100644 (file)
--- a/cps-ncmp-rest-stub/pom.xml
+++ b/cps-ncmp-rest-stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/cps-ncmp-rest/pom.xml b/cps-ncmp-rest/pom.xml
index 70bce02..f34bfd4 100644 (file)
--- a/cps-ncmp-rest/pom.xml
+++ b/cps-ncmp-rest/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/cps-ncmp-service/pom.xml b/cps-ncmp-service/pom.xml
index 6ca5dbb..f448c8f 100644 (file)
--- a/cps-ncmp-service/pom.xml
+++ b/cps-ncmp-service/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 78171be..3e4412b 100755 (executable)
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.onap.cps</groupId>
     <artifactId>cps-parent</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/cps-path-parser/pom.xml b/cps-path-parser/pom.xml
index 4435dee..e3e39ec 100644 (file)
--- a/cps-path-parser/pom.xml
+++ b/cps-path-parser/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml
index 4278cde..2d9e420 100755 (executable)
--- a/cps-rest/pom.xml
+++ b/cps-rest/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/cps-ri/pom.xml b/cps-ri/pom.xml
index d258760..a30a42a 100644 (file)
--- a/cps-ri/pom.xml
+++ b/cps-ri/pom.xml
@@ -26,7 +26,7 @@
     <parent>\r
         <groupId>org.onap.cps</groupId>\r
         <artifactId>cps-parent</artifactId>\r
-        <version>3.4.0-SNAPSHOT</version>\r
+        <version>3.4.1-SNAPSHOT</version>\r
         <relativePath>../cps-parent/pom.xml</relativePath>\r
     </parent>\r
 \r

diff --git a/cps-service/pom.xml b/cps-service/pom.xml
index a2c0d5a..3749f71 100644 (file)
--- a/cps-service/pom.xml
+++ b/cps-service/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.onap.cps</groupId>
     <artifactId>cps-parent</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.4.1-SNAPSHOT</version>
     <relativePath>../cps-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml b/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml
index a2e947e..c298651 100644 (file)
--- a/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml
+++ b/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>dmi-plugin-demo-and-csit-stub</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dmi-plugin-demo-and-csit-stub-app</artifactId>

diff --git a/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml b/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml
index f45f3ea..e37df42 100644 (file)
--- a/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml
+++ b/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>dmi-plugin-demo-and-csit-stub</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
     <artifactId>dmi-plugin-demo-and-csit-stub-service</artifactId>
 

diff --git a/dmi-plugin-demo-and-csit-stub/pom.xml b/dmi-plugin-demo-and-csit-stub/pom.xml
index 62f08ad..cfba461 100644 (file)
--- a/dmi-plugin-demo-and-csit-stub/pom.xml
+++ b/dmi-plugin-demo-and-csit-stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/docs/_static/cps-r13-arch-diagram.png b/docs/_static/cps-r13-arch-diagram.png
new file mode 100644 (file)
index 0000000..739d52c
Binary files /dev/null and b/docs/_static/cps-r13-arch-diagram.png differ

diff --git a/docs/_static/cps-r9-arch-diagram.png b/docs/_static/cps-r9-arch-diagram.png
deleted file mode 100644 (file)
index 1818041..0000000
Binary files a/docs/_static/cps-r9-arch-diagram.png and /dev/null differ

diff --git a/docs/images/cps-service-console.JPG b/docs/_static/cps-service-console.JPG
similarity index 100%
rename from docs/images/cps-service-console.JPG
rename to docs/_static/cps-service-console.JPG

diff --git a/docs/_static/star.png b/docs/_static/star.png
deleted file mode 100644 (file)
index 570345c..0000000
Binary files a/docs/_static/star.png and /dev/null differ

diff --git a/docs/admin-guide.rst b/docs/admin-guide.rst
index a4313c1..b58e740 100644 (file)
--- a/docs/admin-guide.rst
+++ b/docs/admin-guide.rst
@@ -97,7 +97,7 @@ Location of log files
 ---------------------
 By default, Spring Boot will only log to the console and will not write log files.
 
-.. image:: images/cps-service-console.JPG
+.. image:: _static/cps-service-console.JPG
   :width: 700
   :alt: CPS service console
 
@@ -159,8 +159,6 @@ Logger configuration is provided as a chart resource :
     +================================+===============================================================================================================================================+
     | cps-core                       | `logback-spring.xml <https://github.com/onap/oom/blob/master/kubernetes/cps/components/cps-core/resources/config/logback-spring.xml>`__       |
     +--------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
-    | cps-temporal                   | `logback.xml <https://github.com/onap/oom/blob/master/kubernetes/cps/components/cps-temporal/resources/config/logback.xml>`__                 |
-    +--------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
     | ncmp-dmi-plugin                | Not yet applicable to DMI-Plugin                                                                                                              |
     +--------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
 

diff --git a/docs/architecture.rst b/docs/architecture.rst
index 8dde47a..d21b213 100644 (file)
--- a/docs/architecture.rst
+++ b/docs/architecture.rst
@@ -16,19 +16,14 @@ High Level Component Definition and Architectural Relationships
 The Configuration Persistence Service (CPS) provides storage for run-time configuration and operational
 parameters that need to be used by ONAP.
 
-In this release CPS is no longer a stand alone component and is released along with Cps-Temporal and the NCMP-DMI-Plugin.
+CPS is no longer a stand alone component and is released along with and the NCMP-DMI-Plugin.
 
 Project page describing eventual scope and ambition is here:
 `Configuration Persistence Service Project <https://wiki.onap.org/display/DW/Configuration+Persistence+Service+Project>`_
 
 This page reflects the state for the latest release.
 
-.. image:: _static/star.png
-    :class: float-left
-
-**Note:** SDC and AAI interfaces have not yet been implemented.
-
-.. image:: _static/cps-r9-arch-diagram.png
+.. image:: _static/cps-r13-arch-diagram.png
 
 API definitions
 ===============
@@ -69,10 +64,6 @@ Configuration Persistence Service provides the following interfaces.
      - - read xNF data
        - query xNF data
      - REST
-   * - CPS-E-06
-     - Temporal Data Access
-     - - data storage and access
-     - REST
    * - CPS-E-07
      - Admin
      - - logging levels and configuration

diff --git a/docs/deployment.rst b/docs/deployment.rst
index 0fee559..59e2ada 100644 (file)
--- a/docs/deployment.rst
+++ b/docs/deployment.rst
@@ -20,7 +20,6 @@ This chart includes different cps components referred as <cps-component-name> fu
 .. container:: ulist
 
   - `cps-core <https://github.com/onap/oom/tree/master/kubernetes/cps/components/cps-core>`__
-  - `cps-temporal <https://github.com/onap/oom/tree/master/kubernetes/cps/components/cps-temporal>`__
   - `ncmp-dmi-plugin <https://github.com/onap/oom/tree/master/kubernetes/cps/components/ncmp-dmi-plugin>`__
 
 Please refer to the `OOM documentation <https://docs.onap.org/projects/onap-oom/en/latest/sections/guides/user_guides/oom_user_guide.html>`_ on how to install and deploy ONAP.
@@ -111,7 +110,6 @@ values.yaml file to be used across different components as :
 .. container:: ulist
 
   - `cps-core <https://github.com/onap/oom/blob/master/kubernetes/cps/components/cps-core/values.yaml>`_
-  - `cps-temporal <https://github.com/onap/oom/blob/master/kubernetes/cps/components/cps-temporal/values.yaml>`_
   - `ncmp-dmi-plugin <https://github.com/onap/oom/blob/master/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml>`_
 
 Below are the list of secrets for different cps components.
@@ -123,10 +121,6 @@ Below are the list of secrets for different cps components.
 +--------------------------+---------------------------------+---------------------------------------------------+
 | cps-core                 | Rest API Authentication         | <my-helm-release>-cps-core-app-user-creds         |
 +--------------------------+---------------------------------+---------------------------------------------------+
-| cps-temporal             | Rest API Authentication         | <my-helm-release>-cps-temporal-app-user-creds     |
-+--------------------------+---------------------------------+---------------------------------------------------+
-| cps-temporal             | Database authentication         | <my-helm-release>-cps-temporal-pg-user-creds      |
-+--------------------------+---------------------------------+---------------------------------------------------+
 | ncmp-dmi-plugin          | Rest API Authentication         | <my-helm-release>-cps-dmi-plugin-user-creds       |
 +--------------------------+---------------------------------+---------------------------------------------------+
 | ncmp-dmi-plugin          | SDNC authentication             | <my-helm-release>-ncmp-dmi-plugin-sdnc-creds      |
@@ -177,8 +171,6 @@ Any spring supported property can be configured by providing in ``config.additio
 +---------------------------------------+---------------------------------------------------------------------------------------------------------+-------------------------------+
 | config.appUserPassword                | Password used by cps-core service to configure the authentication for REST API it exposes.              | Not defined                   |
 |                                       |                                                                                                         |                               |
-|                                       | This is the password to be used by CPS Temporal REST clients to authenticate themselves.                |                               |
-|                                       |                                                                                                         |                               |
 |                                       | If not defined, the password is generated when deploying the application.                               |                               |
 |                                       |                                                                                                         |                               |
 |                                       | See also :ref:`cps_common_credentials_retrieval`.                                                       |                               |
@@ -243,13 +235,6 @@ Any spring supported property can be configured by providing in ``config.additio
 | ssl.endpoint.identification.algorithm |                                                                                                         |                               |
 |                                       | * ``""``, empty string to disable                                                                       |                               |
 +---------------------------------------+---------------------------------------------------------------------------------------------------------+-------------------------------+
-| config.additional.                    | Kafka topic to publish to cps-temporal                                                                  | ``cps.data-updated-events``   |
-| notification.data-updated.topic       |                                                                                                         |                               |
-+---------------------------------------+---------------------------------------------------------------------------------------------------------+-------------------------------+
-| config.additional.                    | Array of dataspaces to be enabled for publishing events to cps-temporal                                 | []                            |
-| notification.data-updated.filters.    | If left blank CPS-Temporal notification will be sent for all dataspaces                                 |                               |
-| enabled-dataspaces                    |                                                                                                         |                               |
-+---------------------------------------+---------------------------------------------------------------------------------------------------------+-------------------------------+
 | config.additional.                    | If asynchronous messaging, user notifications, and updated event persistence should be enabled          | ``true``                      |
 | notification.data-updated.enabled     |                                                                                                         |                               |
 +---------------------------------------+---------------------------------------------------------------------------------------------------------+-------------------------------+
@@ -339,4 +324,4 @@ Below are the list of distributed datastructures that we have.
 | cps-ncmp     | moduleSetTagCacheMapConfig      | Stores the Module Set Tags for cmHandles.                |
 +--------------+---------------------------------+----------------------------------------------------------+
 
-Total number of caches : 8
\ No newline at end of file
+Total number of caches : 8

diff --git a/docs/overview.rst b/docs/overview.rst
index cde6f6d..11ed519 100644 (file)
--- a/docs/overview.rst
+++ b/docs/overview.rst
@@ -48,14 +48,6 @@ NCMP-DMI-Plugin
 The Data-Model-Inventory (DMI) Plugin is a rest interface used to synchronize CM-Handles data between CPS and DMI through the DMI-Plugin.
 This is built previously from the CPS-NF-Proxy component.
 
-CPS-Temporal
-------------
-
-This service is responsible to provide a time oriented perspective for
-operational network data. It provides features to store and retrieve sequences
-of configurations or states along with the associated times when they occurred
-or have been observed.
-
 CPS Project
 ===========
 

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 1b7ef14..02d36a8 100755 (executable)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -12,12 +12,12 @@ CPS Release Notes
     :depth: 2
 ..
 
-..      ========================
-..      * * *   MONTREAL   * * *
-..      ========================
+..      =========================
+..      * * *   NEW DELHI   * * *
+..      =========================
 
-Version: 3.3.10
-===============
+Version: 3.4.1
+==============
 
 Release Data
 ------------
@@ -26,10 +26,10 @@ Release Data
 | **CPS Project**                      |                                                        |
 |                                      |                                                        |
 +--------------------------------------+--------------------------------------------------------+
-| **Docker images**                    | onap/cps-and-ncmp:3.3.10                               |
+| **Docker images**                    | onap/cps-and-ncmp:3.4.1                                |
 |                                      |                                                        |
 +--------------------------------------+--------------------------------------------------------+
-| **Release designation**              | 3.3.10 Montreal                                        |
+| **Release designation**              | 3.4.1 New Delhi                                        |
 |                                      |                                                        |
 +--------------------------------------+--------------------------------------------------------+
 | **Release date**                     | Not yet released                                       |
@@ -38,10 +38,35 @@ Release Data
 
 Bug Fixes
 ---------
-3.3.10
 
-Features
---------
+Version: 3.4.0
+==============
+
+Release Data
+------------
+
++--------------------------------------+--------------------------------------------------------+
+| **CPS Project**                      |                                                        |
+|                                      |                                                        |
++--------------------------------------+--------------------------------------------------------+
+| **Docker images**                    | onap/cps-and-ncmp:3.4.0                                |
+|                                      |                                                        |
++--------------------------------------+--------------------------------------------------------+
+| **Release designation**              | 3.4.0 New Delhi                                        |
+|                                      |                                                        |
++--------------------------------------+--------------------------------------------------------+
+| **Release date**                     | 2023 November 09                                       |
+|                                      |                                                        |
++--------------------------------------+--------------------------------------------------------+
+
+Bug Fixes
+---------
+3.4.0
+    - `CPS-1956 <https://jira.onap.org/browse/CPS-1956>`_ Bug fix for No yang resources stored during cmhandle discovery.
+
+..      ========================
+..      * * *   MONTREAL   * * *
+..      ========================
 
 Version: 3.3.9
 ==============
@@ -1098,7 +1123,6 @@ Following CPS components are available with default ONAP/CPS installation.
     * Service components
 
         - CPS-NCMP
-        - CPS-Temporal
         - DMI-Plugin
 
     * Additional resources that CPS utilizes deployed using ONAP common charts

diff --git a/docs/tox.ini b/docs/tox.ini
index 7020752..4e99dc2 100644 (file)
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -27,7 +27,7 @@ deps =
     -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
 commands =
-    sphinx-build -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html
+    sphinx-build -W -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html
 [testenv:docs-linkcheck]
 basepython = python3.10
 deps =
@@ -35,7 +35,7 @@ deps =
     -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
 commands =
-    sphinx-build -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck
+    sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck
 [testenv:docs-spellcheck]
 basepython = python3.10
 deps =

diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 65bdd13..4a8ec5b 100644 (file)
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/jacoco-report/pom.xml b/jacoco-report/pom.xml
index 4cf09c2..5580119 100644 (file)
--- a/jacoco-report/pom.xml
+++ b/jacoco-report/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.cps</groupId>
         <artifactId>cps-parent</artifactId>
-        <version>3.4.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <relativePath>../cps-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
index ac19cab..675b5a4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 \r
     <groupId>org.onap.cps</groupId>\r
     <artifactId>cps-aggregator</artifactId>\r
-    <version>3.4.0-SNAPSHOT</version>\r
+    <version>3.4.1-SNAPSHOT</version>\r
     <packaging>pom</packaging>\r
 \r
     <name>cps</name>\r

diff --git a/releases/3.4.0-container.yaml b/releases/3.4.0-container.yaml
new file mode 100644 (file)
index 0000000..ecf745e
--- /dev/null
+++ b/releases/3.4.0-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: container
+container_release_tag: 3.4.0
+project: cps
+log_dir: cps-maven-docker-stage-master/931/
+ref: 89e0fe2ac01031fe15c0518cd4e47f2239a25444
+containers:
+  - name: 'cps-and-ncmp'
+    version: '3.4.0-20231109T124518Z'
\ No newline at end of file

diff --git a/releases/3.4.0.yaml b/releases/3.4.0.yaml
new file mode 100644 (file)
index 0000000..d802280
--- /dev/null
+++ b/releases/3.4.0.yaml
@@ -0,0 +1,4 @@
+distribution_type: maven
+log_dir: cps-maven-stage-master/939/
+project: cps
+version: 3.4.0
\ No newline at end of file

diff --git a/spotbugs/pom.xml b/spotbugs/pom.xml
index b584279..2c7a903 100644 (file)
--- a/spotbugs/pom.xml
+++ b/spotbugs/pom.xml
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.cps</groupId>
     <artifactId>spotbugs</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.4.1-SNAPSHOT</version>
 
     <properties>
         <nexusproxy>https://nexus.onap.org</nexusproxy>

diff --git a/version.properties b/version.properties
index c0da6a4..919f72e 100755 (executable)
--- a/version.properties
+++ b/version.properties
@@ -22,7 +22,7 @@
 
 major=3
 minor=4
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}