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 <pdragosh@research.att.com>
(cherry picked from commit ea8ac37e7ae72ee465c14ce7b418b074b8207b0a)
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/capabilities/pom.xml b/capabilities/pom.xml
index 81ec2d4..c5c89c5 100644 (file)
--- a/capabilities/pom.xml
+++ b/capabilities/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.common</groupId>
         <artifactId>common-modules</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>capabilities</artifactId>

diff --git a/common-logging/pom.xml b/common-logging/pom.xml
index e306346..49fb58f 100644 (file)
--- a/common-logging/pom.xml
+++ b/common-logging/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.common</groupId>
         <artifactId>common-modules</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>ONAP-Logging</artifactId>

diff --git a/common-parameters/pom.xml b/common-parameters/pom.xml
index 94dfce9..c0f6dca 100644 (file)
--- a/common-parameters/pom.xml
+++ b/common-parameters/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.common</groupId>
         <artifactId>common-modules</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>common-parameters</artifactId>

diff --git a/integrity-audit/pom.xml b/integrity-audit/pom.xml
index 1e0ffc7..3c2f865 100644 (file)
--- a/integrity-audit/pom.xml
+++ b/integrity-audit/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.policy.common</groupId>
         <artifactId>common-modules</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
 
     <name>Integrity Audit</name>

diff --git a/integrity-monitor/pom.xml b/integrity-monitor/pom.xml
index 26b63f1..6ca1370 100644 (file)
--- a/integrity-monitor/pom.xml
+++ b/integrity-monitor/pom.xml
@@ -29,7 +29,7 @@
        <parent>
                <groupId>org.onap.policy.common</groupId>
                <artifactId>common-modules</artifactId>
-               <version>1.3.2-SNAPSHOT</version>
+               <version>1.3.3-SNAPSHOT</version>
        </parent>
 
        <name>Integrity Monitor</name>

diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml
index 31a5b10..f93a573 100644 (file)
--- a/policy-endpoints/pom.xml
+++ b/policy-endpoints/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.common</groupId>
         <artifactId>common-modules</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-endpoints</artifactId>

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 746798f..e20fb59 100644 (file)
--- 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 3365b4e..9b2e6f5 100644 (file)
--- 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 24dc9e1..c9064d4 100644 (file)
--- 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 1f99315..9c1e4af 100644 (file)
--- 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 5b3a6f8..586df15 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.policy.common</groupId>
     <artifactId>common-modules</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 

diff --git a/utils-test/pom.xml b/utils-test/pom.xml
index 1bc1b2b..95427b7 100644 (file)
--- a/utils-test/pom.xml
+++ b/utils-test/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.common</groupId>
         <artifactId>common-modules</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>utils-test</artifactId>

diff --git a/utils/pom.xml b/utils/pom.xml
index 88ee755..84f2b40 100644 (file)
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.common</groupId>
         <artifactId>common-modules</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>utils</artifactId>

diff --git a/version.properties b/version.properties
index 0969948..78b140e 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=3
-patch=2
+patch=3
 
 base_version=${major}.${minor}.${patch}