diff options
| author |   egernug <gerard.nugent@est.tech> | 2025-04-01 10:12:57 +0100 |
|---|---|---|
| committer | egernug <gerard.nugent@est.tech> | 2025-04-04 14:16:08 +0100 |
| commit | 2176105ab72a9ca1be972834d6b4750b1afea494 (patch) | |
| tree | ae604b19e18db647646789bab8bddc630186fb21 | |
| parent | ff082dd9115d9927d2674b8665440f1a45bda93b (diff) | |
Update Springboot to eliminate transitive vulnerabilities
Issue-ID: CPS-2725
Change-Id: Iafa07af4d95bc2f396385c607dde63f2d3eab8c8
Signed-off-by: egernug <gerard.nugent@est.tech>
4 files changed, 5 insertions, 4 deletions
diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml index 82ec504b80..0bb976e7e2 100644 --- a/cps-dependencies/pom.xml +++ b/cps-dependencies/pom.xml @@ -86,14 +86,14 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>3.4.1</version> + <version>3.4.4</version> <type>pom</type> <scope>import</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-cache</artifactId> - <version>3.4.1</version> + <version>3.4.4</version> </dependency> <dependency> <groupId>org.springframework.cloud</groupId> diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/data/async/DmiAsyncRequestResponseEventConsumer.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/data/async/DmiAsyncRequestResponseEventConsumer.java index e2803e89a1..f22a58fd49 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/data/async/DmiAsyncRequestResponseEventConsumer.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/data/async/DmiAsyncRequestResponseEventConsumer.java @@ -50,6 +50,7 @@ public class DmiAsyncRequestResponseEventConsumer { topics = "${app.ncmp.async-m2m.topic}", filter = "includeNonCloudEventsOnly", groupId = "ncmp-async-rest-request-event-group", + containerFactory = "legacyEventConcurrentKafkaListenerContainerFactory", properties = {"spring.json.value.default.type=org.onap.cps.ncmp.event.model.DmiAsyncRequestResponseEvent"}) public void consumeAndForward(final DmiAsyncRequestResponseEvent dmiAsyncRequestResponseEvent) { log.debug("Consuming event {} ...", dmiAsyncRequestResponseEvent); diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/utils/events/MessagingBaseSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/utils/events/MessagingBaseSpec.groovy index d38d5442f2..ab6c3fddbf 100644 --- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/utils/events/MessagingBaseSpec.groovy +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/utils/events/MessagingBaseSpec.groovy @@ -44,7 +44,7 @@ class MessagingBaseSpec extends Specification { static kafkaTestContainer = new ConfluentKafkaContainer("confluentinc/cp-kafka:7.8.0") - def legacyEventKafkaTemplate = new KafkaTemplate<>(new DefaultKafkaProducerFactory<String, String>(eventProducerConfigProperties(JsonSerializer))) + def legacyEventKafkaTemplate = new KafkaTemplate<>(new DefaultKafkaProducerFactory<String, ?>(eventProducerConfigProperties(JsonSerializer))) def cloudEventKafkaTemplate = new KafkaTemplate<>(new DefaultKafkaProducerFactory<String, CloudEvent>(eventProducerConfigProperties(CloudEventSerializer))) diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml index 6ae7c3cc55..c39336df96 100644 --- a/cps-parent/pom.xml +++ b/cps-parent/pom.xml @@ -60,7 +60,7 @@ <sonar.version>4.0.0.4121</sonar.version> <spotbugs.plugin.version>4.8.6.4</spotbugs.plugin.version> <spotbugs.version>4.8.6</spotbugs.version> - <spring.boot.maven.plugin.version>3.4.1</spring.boot.maven.plugin.version> + <spring.boot.maven.plugin.version>3.4.4</spring.boot.maven.plugin.version> <swagger.codegen.version>1.2.1</swagger.codegen.version> <!-- Reporting paths and coverage --> |