From: puthuparambil.aditya Date: Fri, 25 Feb 2022 13:24:03 +0000 (+0000) Subject: Updated openapi.yaml to match to changes in get data node API X-Git-Tag: 3.0.0~19^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=cps.git;a=commitdiff_plain;h=cc17ae5e08acf4fd5e67185982142326318f5bef Updated openapi.yaml to match to changes in get data node API 1. updated the pom version to 3.0.0-SNAPSHOT 2. modified the examples for get data node api to match the post api. Issue-ID: CPS-865 Signed-off-by: puthuparambil.aditya Change-Id: Icf03522e9ba7fb9c245fd9f09b3eb8bb6f3ee60d --- diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml index ef7c09fe1..07e6cf966 100644 --- a/checkstyle/pom.xml +++ b/checkstyle/pom.xml @@ -25,7 +25,7 @@ 4.0.0 org.onap.cps checkstyle - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT https://nexus.onap.org diff --git a/cps-application/pom.xml b/cps-application/pom.xml index 24e41c0cd..50b06b2e6 100755 --- a/cps-application/pom.xml +++ b/cps-application/pom.xml @@ -27,7 +27,7 @@ org.onap.cps cps-parent - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT ../cps-parent/pom.xml diff --git a/cps-bom/pom.xml b/cps-bom/pom.xml index 7da4abf36..3e5f70d77 100644 --- a/cps-bom/pom.xml +++ b/cps-bom/pom.xml @@ -25,7 +25,7 @@ 4.0.0 org.onap.cps cps-bom - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT pom This artifact contains dependencyManagement declarations of all published CPS components. diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml index 3d15f0e9a..a76cd3d65 100755 --- a/cps-dependencies/pom.xml +++ b/cps-dependencies/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.cps cps-dependencies - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT pom ${project.groupId}:${project.artifactId} diff --git a/cps-events/pom.xml b/cps-events/pom.xml index 4327a3aa9..b9b399c95 100644 --- a/cps-events/pom.xml +++ b/cps-events/pom.xml @@ -24,7 +24,7 @@ org.onap.cps cps-parent - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT ../cps-parent/pom.xml diff --git a/cps-ncmp-rest/pom.xml b/cps-ncmp-rest/pom.xml index 26b83bef8..b3ae81be5 100644 --- a/cps-ncmp-rest/pom.xml +++ b/cps-ncmp-rest/pom.xml @@ -27,7 +27,7 @@ org.onap.cps cps-parent - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT ../cps-parent/pom.xml diff --git a/cps-ncmp-service/pom.xml b/cps-ncmp-service/pom.xml index 871bd14c5..5145a12ce 100644 --- a/cps-ncmp-service/pom.xml +++ b/cps-ncmp-service/pom.xml @@ -26,7 +26,7 @@ org.onap.cps cps-parent - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT ../cps-parent/pom.xml diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml index 2e0528e97..434464ac6 100755 --- a/cps-parent/pom.xml +++ b/cps-parent/pom.xml @@ -32,7 +32,7 @@ org.onap.cps cps-parent - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT pom diff --git a/cps-path-parser/pom.xml b/cps-path-parser/pom.xml index 206f0094c..c8b88e8aa 100644 --- a/cps-path-parser/pom.xml +++ b/cps-path-parser/pom.xml @@ -23,7 +23,7 @@ org.onap.cps cps-parent - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT ../cps-parent/pom.xml diff --git a/cps-rest/docs/openapi/components.yml b/cps-rest/docs/openapi/components.yml index 5f31569c9..ae0326d7e 100644 --- a/cps-rest/docs/openapi/components.yml +++ b/cps-rest/docs/openapi/components.yml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (c) 2021 Bell Canada. +# Copyright (c) 2021-2022 Bell Canada. # Modifications Copyright (C) 2021-2022 Nordix Foundation # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -86,7 +86,7 @@ components: example: my-schema-set examples: - dataSampleRequest: + dataSample: value: test:bookstore: bookstore-name: Chapters @@ -96,16 +96,6 @@ components: - code: 02 name: kids - dataSampleResponse: - summary: The data node returned does not include the root node. This is being investigated as a part of CPS-461 - value: - bookstore-name: Chapters - categories: - - code: 01 - name: SciFi - - code: 02 - name: kids - parameters: dataspaceNameInQuery: name: dataspace-name @@ -269,7 +259,7 @@ components: schema: type: object examples: - dataSampleResponse: + dataSample: value: "" Created: description: Created diff --git a/cps-rest/docs/openapi/cpsData.yml b/cps-rest/docs/openapi/cpsData.yml index 099512d7d..265ee23ad 100644 --- a/cps-rest/docs/openapi/cpsData.yml +++ b/cps-rest/docs/openapi/cpsData.yml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (c) 2021 Bell Canada. +# Copyright (c) 2021-2022 Bell Canada. # Modifications Copyright (C) 2021-2022 Nordix Foundation # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -37,8 +37,8 @@ nodeByDataspaceAndAnchor: schema: type: object examples: - dataSampleResponse: - $ref: 'components.yml#/components/examples/dataSampleResponse' + dataSample: + $ref: 'components.yml#/components/examples/dataSample' '400': $ref: 'components.yml#/components/responses/BadRequest' '401': @@ -68,8 +68,8 @@ listElementByDataspaceAndAnchor: schema: type: object examples: - dataSampleRequest: - $ref: 'components.yml#/components/examples/dataSampleRequest' + dataSample: + $ref: 'components.yml#/components/examples/dataSample' responses: '201': $ref: 'components.yml#/components/responses/Created' @@ -99,8 +99,8 @@ listElementByDataspaceAndAnchor: schema: type: object examples: - dataSampleRequest: - $ref: 'components.yml#/components/examples/dataSampleRequest' + dataSample: + $ref: 'components.yml#/components/examples/dataSample' responses: '200': $ref: 'components.yml#/components/responses/Ok' @@ -155,8 +155,8 @@ nodesByDataspaceAndAnchor: schema: type: object examples: - dataSampleRequest: - $ref: 'components.yml#/components/examples/dataSampleRequest' + dataSample: + $ref: 'components.yml#/components/examples/dataSample' responses: '201': $ref: 'components.yml#/components/responses/Created' @@ -188,8 +188,8 @@ nodesByDataspaceAndAnchor: schema: type: object examples: - dataSampleRequest: - $ref: 'components.yml#/components/examples/dataSampleRequest' + dataSample: + $ref: 'components.yml#/components/examples/dataSample' responses: '200': $ref: 'components.yml#/components/responses/Ok' @@ -241,8 +241,8 @@ nodesByDataspaceAndAnchor: schema: type: object examples: - dataSampleRequest: - $ref: 'components.yml#/components/examples/dataSampleRequest' + dataSample: + $ref: 'components.yml#/components/examples/dataSample' responses: '200': $ref: 'components.yml#/components/responses/Ok' diff --git a/cps-rest/docs/openapi/cpsQuery.yml b/cps-rest/docs/openapi/cpsQuery.yml index 06c9ca2a2..dc0402d03 100644 --- a/cps-rest/docs/openapi/cpsQuery.yml +++ b/cps-rest/docs/openapi/cpsQuery.yml @@ -1,6 +1,6 @@ # ============LICENSE_START======================================================= # Copyright (C) 2021 Nordix Foundation -# Copyright (C) 2021-2022 Nordix Foundation +# Modifications Copyright (c) 2022 Bell Canada. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -37,8 +37,8 @@ nodesByDataspaceAndAnchorAndCpsPath: schema: type: object examples: - dataSampleResponse: - $ref: 'components.yml#/components/examples/dataSampleResponse' + dataSample: + $ref: 'components.yml#/components/examples/dataSample' '400': $ref: 'components.yml#/components/responses/BadRequest' '401': diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml index 0ca5fb6aa..20870c369 100755 --- a/cps-rest/pom.xml +++ b/cps-rest/pom.xml @@ -27,7 +27,7 @@ org.onap.cps cps-parent - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT ../cps-parent/pom.xml diff --git a/cps-ri/pom.xml b/cps-ri/pom.xml index 8d860b004..37d93156a 100644 --- a/cps-ri/pom.xml +++ b/cps-ri/pom.xml @@ -26,7 +26,7 @@ org.onap.cps cps-parent - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT ../cps-parent/pom.xml diff --git a/cps-service/pom.xml b/cps-service/pom.xml index bfc3931bc..9c7031e2f 100644 --- a/cps-service/pom.xml +++ b/cps-service/pom.xml @@ -28,7 +28,7 @@ org.onap.cps cps-parent - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT ../cps-parent/pom.xml diff --git a/docs/release-notes.rst b/docs/release-notes.rst index c7d5d39e6..39648c6b2 100755 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -19,7 +19,7 @@ CPS Release Notes .. * * * JAKARTA * * * .. ======================== -Version: 2.1.0-SNAPSHOT +Version: 3.0.0-SNAPSHOT ======================= This section lists the main changes & fixes merged into master (snapshot) version of CPS-NCMP. This information is here to assist developers that want experiment/test using our latest code bases directly. Stability of this is not guaranteed. diff --git a/jacoco-report/pom.xml b/jacoco-report/pom.xml index 25a0bfec8..6c2729cc9 100644 --- a/jacoco-report/pom.xml +++ b/jacoco-report/pom.xml @@ -5,7 +5,7 @@ org.onap.cps cps-parent - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT ../cps-parent/pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c7d622692..87398bd24 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.onap.cps cps-aggregator - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT pom cps diff --git a/spotbugs/pom.xml b/spotbugs/pom.xml index 028cd4955..50cef487e 100644 --- a/spotbugs/pom.xml +++ b/spotbugs/pom.xml @@ -25,7 +25,7 @@ 4.0.0 org.onap.cps spotbugs - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT https://nexus.onap.org diff --git a/version.properties b/version.properties index 07ef49adb..17f2daa6c 100755 --- a/version.properties +++ b/version.properties @@ -1,5 +1,6 @@ # ============LICENSE_START======================================================= # Copyright (C) 2021 Nordix Foundation +# Modifications Copyright (C) 2022 Bell Canada. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,8 +20,8 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support this -major=2 -minor=1 +major=3 +minor=0 patch=0 base_version=${major}.${minor}.${patch}