diff options
26 files changed, 114 insertions, 23 deletions
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml index 441597427..053482479 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.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <profiles> <profile> diff --git a/cps-application/pom.xml b/cps-application/pom.xml index e384d00e1..b06d9e69d 100755 --- a/cps-application/pom.xml +++ b/cps-application/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.cps</groupId> <artifactId>cps-parent</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-bom/pom.xml b/cps-bom/pom.xml index 6c9340ec2..670fd3306 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.1.2-SNAPSHOT</version> + <version>3.1.4-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 bcf6d0555..df572de5e 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.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <packaging>pom</packaging> <name>${project.groupId}:${project.artifactId}</name> diff --git a/cps-events/pom.xml b/cps-events/pom.xml index 945af53fd..458166e3c 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.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-ncmp-events/pom.xml b/cps-ncmp-events/pom.xml index 19026f4fd..daaf36bd9 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.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-ncmp-rest-stub/pom.xml b/cps-ncmp-rest-stub/pom.xml index 6cb1a8914..4aeb0a17d 100644 --- a/cps-ncmp-rest-stub/pom.xml +++ b/cps-ncmp-rest-stub/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.cps</groupId> <artifactId>cps-parent</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-ncmp-rest/pom.xml b/cps-ncmp-rest/pom.xml index 031cc4806..2b3c69231 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.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-ncmp-service/pom.xml b/cps-ncmp-service/pom.xml index db2964751..5fcf6017a 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.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsService.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsService.java index 762b21ef3..d6857d36a 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsService.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsService.java @@ -24,6 +24,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.onap.ncmp.cmhandle.event.lcm.LcmEvent; import org.springframework.beans.factory.annotation.Value; +import org.springframework.kafka.KafkaException; import org.springframework.stereotype.Service; /** @@ -51,7 +52,11 @@ public class LcmEventsService { */ public void publishLcmEvent(final String cmHandleId, final LcmEvent lcmEvent) { if (notificationsEnabled) { - lcmEventsPublisher.publishEvent(topicName, cmHandleId, lcmEvent); + try { + lcmEventsPublisher.publishEvent(topicName, cmHandleId, lcmEvent); + } catch (final KafkaException e) { + log.error("Unable to publish message to topic : {} and cause : {}", topicName, e.getMessage()); + } } else { log.debug("Notifications disabled."); } diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsServiceSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsServiceSpec.groovy index 1eae357bb..ef399e1c6 100644 --- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsServiceSpec.groovy +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/lcm/LcmEventsServiceSpec.groovy @@ -21,6 +21,7 @@ package org.onap.cps.ncmp.api.impl.event.lcm import org.onap.ncmp.cmhandle.event.lcm.LcmEvent +import org.springframework.kafka.KafkaException import spock.lang.Specification class LcmEventsServiceSpec extends Specification { @@ -45,4 +46,17 @@ class LcmEventsServiceSpec extends Specification { 'disabled' | false || 0 } + def 'Unable to send message'(){ + given: 'a cm handle id and Lcm Event and notification enabled' + def cmHandleId = 'test-cm-handle-id' + def lcmEvent = new LcmEvent(eventId: UUID.randomUUID().toString(), eventCorrelationId: cmHandleId) + objectUnderTest.notificationsEnabled = true + when: 'publisher set to throw an exception' + mockLcmEventsPublisher.publishEvent(*_) >> { throw new KafkaException('publishing failed')} + and: 'an event is publised' + objectUnderTest.publishLcmEvent(cmHandleId, lcmEvent) + then: 'the exception is just logged and not bubbled up' + noExceptionThrown() + } + } diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml index fa1da20e3..b1c9d2699 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.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <packaging>pom</packaging> <properties> diff --git a/cps-path-parser/pom.xml b/cps-path-parser/pom.xml index d80bddcc3..5e94d6bfb 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.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml index 0d8665956..394a992cd 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.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/cps-ri/pom.xml b/cps-ri/pom.xml index 25d737054..5d745c1d2 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.1.2-SNAPSHOT</version>
+ <version>3.1.4-SNAPSHOT</version>
<relativePath>../cps-parent/pom.xml</relativePath>
</parent>
diff --git a/cps-ri/src/main/java/org/onap/cps/spi/entities/YangResourceEntity.java b/cps-ri/src/main/java/org/onap/cps/spi/entities/YangResourceEntity.java index 7a864a921..53ae82026 100644 --- a/cps-ri/src/main/java/org/onap/cps/spi/entities/YangResourceEntity.java +++ b/cps-ri/src/main/java/org/onap/cps/spi/entities/YangResourceEntity.java @@ -66,7 +66,6 @@ public class YangResourceEntity implements Serializable { @Column private String moduleName; - @NotNull @Column private String revision; diff --git a/cps-service/pom.xml b/cps-service/pom.xml index dfd92fb69..574a54bca 100644 --- a/cps-service/pom.xml +++ b/cps-service/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.cps</groupId> <artifactId>cps-parent</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> diff --git a/docs/release-notes.rst b/docs/release-notes.rst index d3c21761a..1a3bcbc2c 100755 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -16,6 +16,55 @@ CPS Release Notes .. * * * KOHN * * * .. ==================== +Version: 3.1.4 +============== + +Release Data +------------ + ++--------------------------------------+--------------------------------------------------------+ +| **CPS Project** | | +| | | ++--------------------------------------+--------------------------------------------------------+ +| **Docker images** | onap/cps-and-ncmp:3.1.4 | +| | | ++--------------------------------------+--------------------------------------------------------+ +| **Release designation** | 3.1.4 Kohn | +| | | ++--------------------------------------+--------------------------------------------------------+ +| **Release date** | (yet to release) | +| | | ++--------------------------------------+--------------------------------------------------------+ + +Bug Fixes +--------- + - `CPS-1265 <https://jira.onap.org/browse/CPS-1265>`_ Revision field should not be required (NotNull) on cps-ri YangResourceEntity + - `CPS-1294 <https://jira.onap.org/browse/CPS-1294>`_ Kafka communication fault caused cmHandle registration error + +Version: 3.1.3 +============== + +Release Data +------------ + ++--------------------------------------+--------------------------------------------------------+ +| **CPS Project** | | +| | | ++--------------------------------------+--------------------------------------------------------+ +| **Docker images** | onap/cps-and-ncmp:3.1.3 | +| | | ++--------------------------------------+--------------------------------------------------------+ +| **Release designation** | 3.1.3 Kohn | +| | | ++--------------------------------------+--------------------------------------------------------+ +| **Release date** | 2022 September 29 | +| | | ++--------------------------------------+--------------------------------------------------------+ + +Bug Fixes +--------- + - None + Version: 3.1.2 ============== @@ -32,7 +81,7 @@ Release Data | **Release designation** | 3.1.2 Kohn | | | | +--------------------------------------+--------------------------------------------------------+ -| **Release date** | (yet to release) | +| **Release date** | 2022 September 28 | | | | +--------------------------------------+--------------------------------------------------------+ diff --git a/jacoco-report/pom.xml b/jacoco-report/pom.xml index 93ac63b19..0e3b63cba 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.1.2-SNAPSHOT</version> + <version>3.1.4-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.1.2-SNAPSHOT</version>
+ <version>3.1.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>cps</name>
@@ -44,8 +44,8 @@ </organization>
<properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- <maven.install.skip>true</maven.install.skip>
+ <maven.deploy.skip>false</maven.deploy.skip>
+ <maven.install.skip>false</maven.install.skip>
</properties>
<modules>
diff --git a/releases/3.1.2-container.yaml b/releases/3.1.2-container.yaml new file mode 100644 index 000000000..21fdacdd3 --- /dev/null +++ b/releases/3.1.2-container.yaml @@ -0,0 +1,8 @@ +distribution_type: container +container_release_tag: 3.1.2 +project: cps +log_dir: cps-maven-docker-stage-master/708/ +ref: ef0ddfc3e80ad3c2d7fdd884f83c739bf3a80734 +containers: + - name: 'cps-and-ncmp' + version: '3.1.2-20220928T115509Z' diff --git a/releases/3.1.2.yaml b/releases/3.1.2.yaml new file mode 100644 index 000000000..d4e6f42d1 --- /dev/null +++ b/releases/3.1.2.yaml @@ -0,0 +1,4 @@ +distribution_type: maven +log_dir: cps-maven-stage-master/714/ +project: cps +version: 3.1.2 diff --git a/releases/3.1.3-container.yaml b/releases/3.1.3-container.yaml new file mode 100644 index 000000000..d814433b1 --- /dev/null +++ b/releases/3.1.3-container.yaml @@ -0,0 +1,8 @@ +distribution_type: container +container_release_tag: 3.1.3 +project: cps +log_dir: cps-maven-docker-stage-master/710/ +ref: 06736cb733a8bfa1a5c19b36ce26b0f7a394db31 +containers: + - name: 'cps-and-ncmp' + version: '3.1.3-20220929T153732Z' diff --git a/releases/3.1.3.yaml b/releases/3.1.3.yaml new file mode 100644 index 000000000..7e34f0824 --- /dev/null +++ b/releases/3.1.3.yaml @@ -0,0 +1,4 @@ +distribution_type: maven +log_dir: cps-maven-stage-master/716/ +project: cps +version: 3.1.3
\ No newline at end of file diff --git a/spotbugs/pom.xml b/spotbugs/pom.xml index 91efe88c8..a85ff5f0c 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.1.2-SNAPSHOT</version> + <version>3.1.4-SNAPSHOT</version> <properties> <nexusproxy>https://nexus.onap.org</nexusproxy> diff --git a/version.properties b/version.properties index f576b3133..5f383dfdb 100755 --- a/version.properties +++ b/version.properties @@ -22,7 +22,7 @@ major=3 minor=1 -patch=2 +patch=4 base_version=${major}.${minor}.${patch} |