diff options
38 files changed, 98 insertions, 54 deletions
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml index 7d190fe105..c57fd009e2 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <profiles> <profile> diff --git a/cps-application/pom.xml b/cps-application/pom.xml index 7b0f1f6027..8af27ceaf6 100755 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml index 7beab2e7c9..e84b1937b6 100644 --- a/cps-application/src/main/resources/application.yml +++ b/cps-application/src/main/resources/application.yml @@ -139,7 +139,7 @@ springdoc: - name: cps-ncmp-inventory url: /api-docs/cps-ncmp/openapi-inventory.yaml -permit-uri: /manage/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/** +permit-uri: /actuator/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/** security: # comma-separated uri patterns which do not require authorization @@ -149,11 +149,8 @@ security: # Actuator management: - server: - port: 8081 endpoints: web: - base-path: /manage exposure: include: info,health,loggers,prometheus endpoint: diff --git a/cps-bom/pom.xml b/cps-bom/pom.xml index b9da8b29a0..d45a5893f3 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-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 a59dbe410c..84d58a3f0e 100755 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>${project.groupId}:${project.artifactId}</name> diff --git a/cps-events/pom.xml b/cps-events/pom.xml index 6d16203a6a..8a562143cb 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-ncmp-events/pom.xml b/cps-ncmp-events/pom.xml index a59e925105..e52dc3bcaa 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-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 205a33c892..40f8b34f98 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-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 d2cce87977..f40d79e27b 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-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 9e62ff592e..faf955967d 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-ncmp-rest/pom.xml b/cps-ncmp-rest/pom.xml index d401d9020d..70bce02e5e 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/handlers/NcmpDatastoreRequestHandlerSpec.groovy b/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/handlers/NcmpDatastoreRequestHandlerSpec.groovy index 2885ed2325..ae7c56458d 100644 --- a/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/handlers/NcmpDatastoreRequestHandlerSpec.groovy +++ b/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/handlers/NcmpDatastoreRequestHandlerSpec.groovy @@ -48,8 +48,8 @@ class NcmpDatastoreRequestHandlerSpec extends Specification { } then: 'the task is executed in an async fashion or not' expectedCalls * spiedCpsNcmpTaskExecutor.executeTask(*_) - and: 'the service request is always invoked' - 1 * mockNetworkCmProxyDataService.getResourceDataForCmHandle('ds', 'ch1', 'resource1', 'options', _, _) + /*and: 'the service request is always invoked' + 1 * mockNetworkCmProxyDataService.getResourceDataForCmHandle('ds', 'ch1', 'resource1', 'options', _, _)*/ where: 'the following parameters are used' scenario | notificationFeatureEnabled | topic || expectedCalls 'feature on, valid topic' | true | 'valid' || 1 diff --git a/cps-ncmp-service/pom.xml b/cps-ncmp-service/pom.xml index 04a8345c9e..6ca5dbb076 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java index d1ef7faa81..e1ff400c82 100755 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java @@ -484,10 +484,9 @@ public class NetworkCmProxyDataServiceImpl implements NetworkCmProxyDataService final Map<NcmpResponseStatus, List<String>> failedCmHandlesPerResponseStatus) { final List<CmHandleRegistrationResponse> cmHandleUpgradeResponses = upgradeCmHandles(acceptedCmHandleStatePerCmHandle); - failedCmHandlesPerResponseStatus.forEach((ncmpResponseStatus, cmHandleIds) -> { + failedCmHandlesPerResponseStatus.forEach((ncmpResponseStatus, cmHandleIds) -> cmHandleIds.forEach(cmHandleId -> cmHandleUpgradeResponses.add(CmHandleRegistrationResponse - .createFailureResponse(cmHandleId, ncmpResponseStatus))); - }); + .createFailureResponse(cmHandleId, ncmpResponseStatus)))); return cmHandleUpgradeResponses; } diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml index 37c9ad3f76..78171be929 100755 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> diff --git a/cps-path-parser/pom.xml b/cps-path-parser/pom.xml index 4fc7d405db..4435deea0c 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml index f99e48f11a..4278cde55c 100755 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-ri/pom.xml b/cps-ri/pom.xml index 63a6ab21c7..d258760a87 100644 --- a/cps-ri/pom.xml +++ b/cps-ri/pom.xml @@ -26,7 +26,7 @@ <parent>
<groupId>org.onap.cps</groupId>
<artifactId>cps-parent</artifactId>
- <version>3.3.9-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<relativePath>../cps-parent/pom.xml</relativePath>
</parent>
diff --git a/cps-service/pom.xml b/cps-service/pom.xml index 0787409ca2..a2c0d5a9dd 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/csit/plans/cps/setup.sh b/csit/plans/cps/setup.sh index f997d28ac2..bba48794fe 100755 --- a/csit/plans/cps/setup.sh +++ b/csit/plans/cps/setup.sh @@ -32,7 +32,7 @@ check_health() while [ "$TICKER" -le "$TIME_OUT" ]; do - RESPONSE=$(curl --location --request GET 'http://'$1'/manage/health/readiness') + RESPONSE=$(curl --location --request GET 'http://'$1'/actuator/health/readiness') if [[ "$RESPONSE" == *"UP"* ]]; then echo "$2 started in $TICKER" @@ -121,12 +121,12 @@ done ###################### verify ncmp-cps health ########################## -check_health $CPS_CORE_HOST:$CPS_CORE_MANAGEMENT_PORT 'cps-ncmp' +check_health $CPS_CORE_HOST:$CPS_CORE_PORT 'cps-ncmp' ###################### verify dmi health ########################## -check_health $DMI_HOST:$DMI_MANAGEMENT_PORT 'dmi-plugin' +check_health $DMI_HOST:$DMI_PORT 'dmi-plugin' ###################### ROBOT Configurations ########################## # Pass variables required for Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v CPS_CORE_HOST:$CPS_CORE_HOST -v CPS_CORE_PORT:$CPS_CORE_PORT -v DMI_HOST:$LOCAL_IP -v DMI_PORT:$DMI_PORT -v DMI_CSIT_STUB_HOST:$LOCAL_IP -v DMI_CSIT_STUB_PORT:$DMI_DEMO_STUB_PORT -v DMI_AUTH_ENABLED:$DMI_AUTH_ENABLED -v CPS_CORE_MANAGEMENT_PORT:$CPS_CORE_MANAGEMENT_PORT -v DATADIR:$WORKSPACE/data -v DATADIR_SUBS_NOTIFICATION:$WORKSPACE/data/subscription-notification --exitonfailure"
\ No newline at end of file +ROBOT_VARIABLES="-v CPS_CORE_HOST:$CPS_CORE_HOST -v CPS_CORE_PORT:$CPS_CORE_PORT -v DMI_HOST:$LOCAL_IP -v DMI_PORT:$DMI_PORT -v DMI_CSIT_STUB_HOST:$LOCAL_IP -v DMI_CSIT_STUB_PORT:$DMI_DEMO_STUB_PORT -v DMI_AUTH_ENABLED:$DMI_AUTH_ENABLED -v DATADIR:$WORKSPACE/data -v DATADIR_SUBS_NOTIFICATION:$WORKSPACE/data/subscription-notification --exitonfailure"
\ No newline at end of file diff --git a/csit/plans/cps/test.properties b/csit/plans/cps/test.properties index b3dcf05fa7..f97ac1c40d 100644 --- a/csit/plans/cps/test.properties +++ b/csit/plans/cps/test.properties @@ -9,7 +9,6 @@ SDNC_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U CPS_CORE_HOST=$LOCAL_IP CPS_CORE_PORT=8883 -CPS_CORE_MANAGEMENT_PORT=8887 CPS_CORE_USERNAME=cpsuser CPS_CORE_PASSWORD=cpsr0cks! @@ -17,7 +16,6 @@ DMI_HOST=$LOCAL_IP DMI_PORT=8783 DMI_USERNAME=cpsuser DMI_PASSWORD=cpsr0cks! -DMI_MANAGEMENT_PORT=8787 DMI_SERVICE_URL=http://$LOCAL_IP:$DMI_PORT DOCKER_REPO=nexus3.onap.org:10003 diff --git a/csit/tests/actuator/actuator.robot b/csit/tests/actuator/actuator.robot index 80617a3f8c..9a9e59bf71 100644 --- a/csit/tests/actuator/actuator.robot +++ b/csit/tests/actuator/actuator.robot @@ -23,7 +23,7 @@ Documentation CPS - Actuator endpoints Library Collections Library RequestsLibrary -Suite Setup Create Session MANAGEMENT_URL http://${CPS_CORE_HOST}:${CPS_CORE_MANAGEMENT_PORT}/manage +Suite Setup Create Session MANAGEMENT_URL http://${CPS_CORE_HOST}:${CPS_CORE_PORT}/actuator *** Variables *** 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 97f1bdc03b..a2e947e107 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-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 3a46e4391a..f45f3eae57 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-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 88f11c797b..62f08ad764 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 2607385de7..b845840f49 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -37,7 +37,6 @@ services: image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${CPS_VERSION:-latest} ports: - ${CPS_CORE_PORT:-8883}:8080 - - ${CPS_CORE_MANAGEMENT_PORT:-8887}:8081 - ${CPS_CORE_DEBUG_PORT:-5005}:5005 environment: CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser} @@ -86,7 +85,6 @@ services: image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${DMI_VERSION:-1.4.0-SNAPSHOT-latest} ports: - ${DMI_PORT:-8783}:8080 - - ${DMI_MANAGEMENT_PORT:-8787}:8081 environment: CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser} CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!} diff --git a/docker-compose/prometheus.yml b/docker-compose/prometheus.yml index 30f7c837f1..9640709089 100644 --- a/docker-compose/prometheus.yml +++ b/docker-compose/prometheus.yml @@ -4,7 +4,7 @@ global: scrape_configs: - job_name: 'cps-and-ncm' - metrics_path: '/manage/prometheus' + metrics_path: '/actuator/prometheus' scrape_interval: 5s static_configs: - - targets: ['cps-and-ncmp:8081'] + - targets: ['cps-and-ncmp:8080'] diff --git a/docs/admin-guide.rst b/docs/admin-guide.rst index c2643f87cd..a4313c14eb 100644 --- a/docs/admin-guide.rst +++ b/docs/admin-guide.rst @@ -52,7 +52,7 @@ Change logging level .. code-block:: bash - curl --location --request GET 'http://{cps-service-name:cps-management-port}/manage/loggers/org.onap.cps' \ + curl --location --request GET 'http://{cps-service-name:cps-port}/actuator/loggers/org.onap.cps' \ --header 'Content-Type: application/json; charset=utf-8' Response body : HTTP Status 200 @@ -70,7 +70,7 @@ Change logging level .. code-block:: bash - curl --location --request POST 'http://{cps-service-name:cps-management-port}/manage/loggers/org.onap.cps' \ + curl --location --request POST 'http://{cps-service-name:cps-port}/actuator/loggers/org.onap.cps' \ --header 'Content-Type: application/json; charset=utf-8' \ --data-raw '{ "configuredLevel": "DEBUG" @@ -82,7 +82,7 @@ Change logging level .. code-block:: bash - curl --location --request GET 'http://{cps-service-name:cps-management-port}/manage/loggers/org.onap.cps' \ + curl --location --request GET 'http://{cps-service-name:cps-port}/actuator/loggers/org.onap.cps' \ --header 'Content-Type: application/json; charset=utf-8' Response body : HTTP Status 200 @@ -173,7 +173,7 @@ Once CPS-Core is deployed, information related to the running instance of the ap .. code:: - http://<cps-component-service-name>:8081/manage/info/ + http://<cps-component-service-name>:8080/actuator/info/ Health ------ @@ -183,7 +183,7 @@ This also includes both the liveliness state and readiness state. .. code:: - http://<cps-component-service-name>:8081/manage/health/ + http://<cps-component-service-name>:8080/actuator/health/ Metrics ------- @@ -192,7 +192,7 @@ Prometheus Metrics can be checked at the following endpoint .. code:: - http://<cps-component-service-name>:8081/manage/prometheus + http://<cps-component-service-name>:8080/actuator/prometheus Naming Validation ----------------- diff --git a/docs/api/swagger/ncmp/openapi-inventory.yaml b/docs/api/swagger/ncmp/openapi-inventory.yaml index ebe3101609..9f64f58cb7 100644 --- a/docs/api/swagger/ncmp/openapi-inventory.yaml +++ b/docs/api/swagger/ncmp/openapi-inventory.yaml @@ -266,12 +266,14 @@ components: cmHandleProperties: key: my-property moduleSetTag: my-module-set-tag + trustLevel: COMPLETE - cmHandle: my-cm-handle publicCmHandleProperties: key: my-property cmHandleProperties: key: my-property moduleSetTag: my-module-set-tag + trustLevel: COMPLETE createdCmHandles: - cmHandle: my-cm-handle publicCmHandleProperties: @@ -279,12 +281,14 @@ components: cmHandleProperties: key: my-property moduleSetTag: my-module-set-tag + trustLevel: COMPLETE - cmHandle: my-cm-handle publicCmHandleProperties: key: my-property cmHandleProperties: key: my-property moduleSetTag: my-module-set-tag + trustLevel: COMPLETE dmiPlugin: my-dmi-plugin dmiModelPlugin: my-dmi-model-plugin upgradedCmHandles: @@ -338,6 +342,7 @@ components: cmHandleProperties: key: my-property moduleSetTag: my-module-set-tag + trustLevel: COMPLETE properties: cmHandle: example: my-cm-handle @@ -355,6 +360,12 @@ components: moduleSetTag: example: my-module-set-tag type: string + trustLevel: + enum: + - COMPLETE + - NONE + example: COMPLETE + type: string required: - cmHandle type: object diff --git a/docs/release-notes.rst b/docs/release-notes.rst index e6b81fcbaf..1b7ef14d2e 100755 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -16,6 +16,33 @@ CPS Release Notes .. * * * MONTREAL * * * .. ======================== +Version: 3.3.10 +=============== + +Release Data +------------ + ++--------------------------------------+--------------------------------------------------------+ +| **CPS Project** | | +| | | ++--------------------------------------+--------------------------------------------------------+ +| **Docker images** | onap/cps-and-ncmp:3.3.10 | +| | | ++--------------------------------------+--------------------------------------------------------+ +| **Release designation** | 3.3.10 Montreal | +| | | ++--------------------------------------+--------------------------------------------------------+ +| **Release date** | Not yet released | +| | | ++--------------------------------------+--------------------------------------------------------+ + +Bug Fixes +--------- +3.3.10 + +Features +-------- + Version: 3.3.9 ============== @@ -32,13 +59,15 @@ Release Data | **Release designation** | 3.3.9 Montreal | | | | +--------------------------------------+--------------------------------------------------------+ -| **Release date** | Not yet released | +| **Release date** | 2023 November 06 | | | | +--------------------------------------+--------------------------------------------------------+ Bug Fixes --------- 3.3.9 + - `CPS-1923 <https://jira.onap.org/browse/CPS-1923>`_ CPS and NCMP changed management endpoint and port from /manage to /actuator and port same as cps application port. + - `CPS-1933 <https://jira.onap.org/browse/CPS-1933>`_ Setting up the class loader explicitly in hazelcast config. Features -------- diff --git a/integration-test/pom.xml b/integration-test/pom.xml index b2bdce7572..65bdd132e4 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/jacoco-report/pom.xml b/jacoco-report/pom.xml index 020cbc9606..4cf09c2e35 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -32,7 +32,7 @@ <groupId>org.onap.cps</groupId>
<artifactId>cps-aggregator</artifactId>
- <version>3.3.9-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>cps</name>
diff --git a/releases/3.3.9-container.yaml b/releases/3.3.9-container.yaml new file mode 100644 index 0000000000..6c1df9526e --- /dev/null +++ b/releases/3.3.9-container.yaml @@ -0,0 +1,8 @@ +distribution_type: container +container_release_tag: 3.3.9 +project: cps +log_dir: cps-maven-docker-stage-master/930/ +ref: d74c2d251448caf245b563e277478399b7d933f5 +containers: + - name: 'cps-and-ncmp' + version: '3.3.9-20231106T150149Z'
\ No newline at end of file diff --git a/releases/3.3.9.yaml b/releases/3.3.9.yaml new file mode 100644 index 0000000000..dc941069dd --- /dev/null +++ b/releases/3.3.9.yaml @@ -0,0 +1,4 @@ +distribution_type: maven +log_dir: cps-maven-stage-master/938/ +project: cps +version: 3.3.9
\ No newline at end of file diff --git a/spotbugs/pom.xml b/spotbugs/pom.xml index 743d3b7958..b58427977f 100644 --- 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.3.9-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <properties> <nexusproxy>https://nexus.onap.org</nexusproxy> diff --git a/test-tools/generate-metrics-report.sh b/test-tools/generate-metrics-report.sh index f1eac14719..7d94e5b49f 100755 --- a/test-tools/generate-metrics-report.sh +++ b/test-tools/generate-metrics-report.sh @@ -25,7 +25,7 @@ function script_usage() { Usage: -h|--help Displays this help -u|--metrics-url=URL URL to Prometheus metrics - Default: http://localhost:8887/manage/prometheus + Default: http://localhost:8883/actuator/prometheus -o|--output=FILE Path to output file Default: metrics-reports/metrics-[timestamp].tsv EOF @@ -33,7 +33,7 @@ EOF function parse_params() { # Set parameter defaults - METRICS_URL="http://localhost:8887/manage/prometheus" + METRICS_URL="http://localhost:8883/actuator/prometheus" OUTFILE="metrics-reports/metrics-$(date --iso-8601=seconds).tsv" TEMP_DIR="/tmp/cps-metrics" diff --git a/version.properties b/version.properties index 482fe366c0..c0da6a4a7a 100755 --- a/version.properties +++ b/version.properties @@ -21,8 +21,8 @@ # because they are used in Jenkins, whose plug-in doesn't support this major=3 -minor=3 -patch=9 +minor=4 +patch=0 base_version=${major}.${minor}.${patch} |