From 7e580d1ea9166134bf3fdf411725bbf038bd23df Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Tue, 6 Nov 2018 13:00:56 -0500 Subject: Update dmaap code for 1.1.9 The new version has changed class names. Adding change to point to released policy/parent. Bumping to 1.3.3 release. Issue-ID: POLICY-1229 Change-Id: Id268b1a57667ffa3b5950dba7c10db2181586245 Signed-off-by: Pamela Dragosh (cherry picked from commit ea8ac37e7ae72ee465c14ce7b418b074b8207b0a) Signed-off-by: Pamela Dragosh --- capabilities/pom.xml | 2 +- common-logging/pom.xml | 2 +- common-parameters/pom.xml | 2 +- integrity-audit/pom.xml | 2 +- integrity-monitor/pom.xml | 2 +- policy-endpoints/pom.xml | 2 +- .../common/endpoints/event/comm/bus/internal/BusConsumer.java | 8 ++++---- .../common/endpoints/event/comm/bus/internal/BusPublisher.java | 6 +++--- .../common/endpoints/event/comm/bus/internal/BusConsumerTest.java | 4 ++-- .../endpoints/event/comm/bus/internal/BusPublisherTest.java | 6 +++--- pom.xml | 4 ++-- utils-test/pom.xml | 2 +- utils/pom.xml | 2 +- version.properties | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/capabilities/pom.xml b/capabilities/pom.xml index 81ec2d4f..c5c89c53 100644 --- a/capabilities/pom.xml +++ b/capabilities/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.common common-modules - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT capabilities diff --git a/common-logging/pom.xml b/common-logging/pom.xml index e306346f..49fb58f7 100644 --- a/common-logging/pom.xml +++ b/common-logging/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.common common-modules - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT ONAP-Logging diff --git a/common-parameters/pom.xml b/common-parameters/pom.xml index 94dfce98..c0f6dcaa 100644 --- a/common-parameters/pom.xml +++ b/common-parameters/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.common common-modules - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT common-parameters diff --git a/integrity-audit/pom.xml b/integrity-audit/pom.xml index 1e0ffc75..3c2f865c 100644 --- a/integrity-audit/pom.xml +++ b/integrity-audit/pom.xml @@ -29,7 +29,7 @@ org.onap.policy.common common-modules - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT Integrity Audit diff --git a/integrity-monitor/pom.xml b/integrity-monitor/pom.xml index 26b63f1e..6ca13707 100644 --- a/integrity-monitor/pom.xml +++ b/integrity-monitor/pom.xml @@ -29,7 +29,7 @@ org.onap.policy.common common-modules - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT Integrity Monitor diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml index 31a5b106..f93a573b 100644 --- a/policy-endpoints/pom.xml +++ b/policy-endpoints/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.common common-modules - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT policy-endpoints 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 746798fa..e20fb598 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 @@ -24,10 +24,6 @@ package org.onap.policy.common.endpoints.event.comm.bus.internal; import com.att.nsa.cambria.client.CambriaClientBuilders; import com.att.nsa.cambria.client.CambriaClientBuilders.ConsumerBuilder; import com.att.nsa.cambria.client.CambriaConsumer; -import com.att.nsa.mr.client.MRClientFactory; -import com.att.nsa.mr.client.impl.MRConsumerImpl; -import com.att.nsa.mr.client.response.MRConsumerResponse; -import com.att.nsa.mr.test.clients.ProtocolTypeConstants; import java.io.IOException; import java.net.MalformedURLException; @@ -37,6 +33,10 @@ import java.util.Map; import java.util.Properties; import org.apache.commons.lang3.StringUtils; +import org.onap.dmaap.mr.client.MRClientFactory; +import org.onap.dmaap.mr.client.impl.MRConsumerImpl; +import org.onap.dmaap.mr.client.response.MRConsumerResponse; +import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants; import org.onap.policy.common.endpoints.event.comm.bus.DmaapTopicSinkFactory; import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties; import org.slf4j.Logger; diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisher.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisher.java index 3365b4ec..9b2e6f5c 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisher.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisher.java @@ -25,9 +25,6 @@ import com.att.nsa.apiClient.http.HttpClient.ConnectionType; import com.att.nsa.cambria.client.CambriaBatchingPublisher; import com.att.nsa.cambria.client.CambriaClientBuilders; import com.att.nsa.cambria.client.CambriaClientBuilders.PublisherBuilder; -import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher; -import com.att.nsa.mr.client.response.MRPublisherResponse; -import com.att.nsa.mr.test.clients.ProtocolTypeConstants; import com.fasterxml.jackson.annotation.JsonIgnore; import java.net.MalformedURLException; @@ -39,6 +36,9 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.StringUtils; +import org.onap.dmaap.mr.client.impl.MRSimplerBatchPublisher; +import org.onap.dmaap.mr.client.response.MRPublisherResponse; +import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants; import org.onap.policy.common.endpoints.event.comm.bus.DmaapTopicSinkFactory; import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties; import org.slf4j.Logger; diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumerTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumerTest.java index 24dc9e10..c9064d45 100644 --- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumerTest.java +++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusConsumerTest.java @@ -29,14 +29,14 @@ import static org.mockito.Mockito.when; import com.att.aft.dme2.internal.apache.commons.collections.IteratorUtils; import com.att.nsa.cambria.client.CambriaConsumer; -import com.att.nsa.mr.client.impl.MRConsumerImpl; -import com.att.nsa.mr.client.response.MRConsumerResponse; import java.io.IOException; import java.util.Arrays; import java.util.Collections; import java.util.List; import org.junit.Before; import org.junit.Test; +import org.onap.dmaap.mr.client.impl.MRConsumerImpl; +import org.onap.dmaap.mr.client.response.MRConsumerResponse; import org.onap.policy.common.endpoints.event.comm.bus.TopicTestBase; import org.onap.policy.common.endpoints.event.comm.bus.internal.BusConsumer.CambriaConsumerWrapper; import org.onap.policy.common.endpoints.event.comm.bus.internal.BusConsumer.DmaapAafConsumerWrapper; diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisherTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisherTest.java index 1f99315e..9c1e4af4 100644 --- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisherTest.java +++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisherTest.java @@ -31,14 +31,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.att.nsa.cambria.client.CambriaBatchingPublisher; -import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher; -import com.att.nsa.mr.client.response.MRPublisherResponse; -import com.att.nsa.mr.test.clients.ProtocolTypeConstants; import java.io.IOException; import java.util.Collections; import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; +import org.onap.dmaap.mr.client.impl.MRSimplerBatchPublisher; +import org.onap.dmaap.mr.client.response.MRPublisherResponse; +import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants; import org.onap.policy.common.endpoints.event.comm.bus.TopicTestBase; import org.onap.policy.common.endpoints.event.comm.bus.internal.BusPublisher.CambriaPublisherWrapper; import org.onap.policy.common.endpoints.event.comm.bus.internal.BusPublisher.DmaapAafPublisherWrapper; diff --git a/pom.xml b/pom.xml index 5b3a6f82..586df15f 100644 --- a/pom.xml +++ b/pom.xml @@ -24,13 +24,13 @@ org.onap.policy.parent integration - 2.0.0 + 2.0.1 org.onap.policy.common common-modules - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT pom diff --git a/utils-test/pom.xml b/utils-test/pom.xml index 1bc1b2b8..95427b75 100644 --- a/utils-test/pom.xml +++ b/utils-test/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.common common-modules - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT utils-test diff --git a/utils/pom.xml b/utils/pom.xml index 88ee7554..84f2b40b 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.common common-modules - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT utils diff --git a/version.properties b/version.properties index 09699482..78b140e8 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1 minor=3 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} -- cgit 1.2.3-korg