From 90901c96e348e8ee65f218b90e46a25d4b85f96d Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Thu, 14 Mar 2024 12:51:14 +0000 Subject: Update dependencies - add dependencies that were brought by oparent - remove versions of dependencies already managed by policy parent - fix any code related to those dependencies Issue-ID: POLICY-4945 Change-Id: I88ec8ec3d0094592c29a4a63d119dfb1022518df Signed-off-by: adheli.tavares --- policy-endpoints/pom.xml | 10 ---------- .../common/endpoints/event/comm/bus/internal/BusConsumer.java | 2 -- .../endpoints/event/comm/client/BidirectionalTopicClient.java | 3 +-- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml index 55f068e4..c6dd4b6e 100644 --- a/policy-endpoints/pom.xml +++ b/policy-endpoints/pom.xml @@ -49,13 +49,6 @@ pom import - - com.fasterxml.jackson - jackson-bom - ${version.jackson} - pom - import - @@ -179,17 +172,14 @@ io.opentelemetry.instrumentation opentelemetry-kafka-clients-2.6 - 1.25.0-alpha io.opentelemetry opentelemetry-exporter-otlp - 1.25.0 io.opentelemetry opentelemetry-sdk-extension-autoconfigure - 1.25.0-alpha com.sun.xml.bind diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumer.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumer.java index 539a78c2..3c57d1ba 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumer.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumer.java @@ -46,7 +46,6 @@ import java.util.concurrent.TimeUnit; import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -54,7 +53,6 @@ import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.header.Headers; -import org.jetbrains.annotations.NotNull; import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/client/BidirectionalTopicClient.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/client/BidirectionalTopicClient.java index b5d53909..4f601fa8 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/client/BidirectionalTopicClient.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/client/BidirectionalTopicClient.java @@ -21,14 +21,13 @@ package org.onap.policy.common.endpoints.event.comm.client; -import java.util.Arrays; +import jakarta.validation.constraints.NotNull; import java.util.Collections; import java.util.List; import java.util.concurrent.BlockingDeque; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; import lombok.Getter; -import org.jetbrains.annotations.NotNull; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.common.endpoints.event.comm.TopicEndpoint; import org.onap.policy.common.endpoints.event.comm.TopicEndpointManager; -- cgit 1.2.3-korg