Update dmaap 1.1.9 changes

Upgrading policy/parent to v1.1.9 requires these
code changes to occur.

Need to change to policy/parent 2.0.1 for the
right dmaap to be included.

Upgrade policy common and drools-applications to
1.3.3 released artifacts.

Also just included the change from gerrit review
https://gerrit.onap.org/r/#/c/72026/ instead of
cherry picking it.

Updating release to 1.3.3-SNAPSHOT

Issue-ID: POLICY-1229
Change-Id: I16f4bbd9ba2d46cdc3b94feba1f2e7f20d837dad
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
(cherry picked from commit fe8b9e72cafa4acf31db4239593a74a5ccf89a4a)
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

4 files changed, 7 insertions, 20 deletions

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 90c15a6b4..a952bd0b3 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineUtils</artifactId>
     <dependencies>
@@ -102,11 +102,6 @@
             <artifactId>gson</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.att.aft</groupId>
-            <artifactId>dme2</artifactId>
-            <version>3.1.200</version>
-        </dependency>
-        <dependency>
             <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
             <artifactId>dmaapClient</artifactId>
             <exclusions>
@@ -114,10 +109,6 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.att.aft</groupId>
-                    <artifactId>dme2</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java
index 6d80a6a78..0d4c86b3d 100644
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java
@@ -23,10 +23,9 @@ package org.onap.policy.utils;
 import java.net.MalformedURLException;
 import java.util.List;
 import java.util.Properties;
-
-import com.att.nsa.mr.client.MRClient.MRApiException;
-import com.att.nsa.mr.client.impl.MRConsumerImpl;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
+import org.onap.dmaap.mr.client.MRClient.MRApiException;
+import org.onap.dmaap.mr.client.impl.MRConsumerImpl;
+import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
 
 public interface BusConsumer {
 	
diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java
index 3a12122bf..745213529 100644
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java
@@ -24,14 +24,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
-
+import org.onap.dmaap.mr.client.impl.MRSimplerBatchPublisher;
+import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
 import org.onap.policy.common.logging.eelf.PolicyLogger;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 
-import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
-
 public interface BusPublisher {
 	
 	/**
diff --git a/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java b/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java
index 37170f077..37f0bb016 100644
--- a/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java
+++ b/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java
@@ -27,11 +27,10 @@ import java.net.MalformedURLException;
 import java.util.Arrays;
 
 import org.junit.Test;
+import org.onap.dmaap.mr.client.MRClient.MRApiException;
 import org.onap.policy.utils.BusConsumer;
 import org.onap.policy.utils.BusPublisher;
 
-import com.att.nsa.mr.client.MRClient.MRApiException;
-
 public class BusTest {
     
     @Test