Merge "Modified dmaapClient dependency GroupId/Version"

diff --combined BRMSGateway/pom.xml
index 94765a7,1b33f0e..6f530b3
--- 1/BRMSGateway/pom.xml
--- 2/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
 -              <version>1.1.2-SNAPSHOT</version>
 +              <version>1.2.0-SNAPSHOT</version>
        </parent>
        <artifactId>BRMSGateway</artifactId>
        <description>This application will take in BRMS rules and acts as interface between PR and PDP XACML</description>
@@@ -83,9 -83,9 +83,9 @@@
                        </exclusions>
                </dependency>
                <dependency>
-                       <groupId>com.att.nsa</groupId>
+                       <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
                        <artifactId>dmaapClient</artifactId>
-                       <version>0.2.12</version>
+                       <version>${dmaap.version}</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>org.slf4j</groupId>

diff --combined ONAP-PAP-REST/pom.xml
index 06b7601,bb61723..7602294
--- 1/ONAP-PAP-REST/pom.xml
--- 2/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@@ -29,7 -29,7 +29,7 @@@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
 -              <version>1.1.2-SNAPSHOT</version>
 +              <version>1.2.0-SNAPSHOT</version>
        </parent>
        <build>
                <plugins>
@@@ -76,7 -76,7 +76,7 @@@
                                        <artifactId>json</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>com.att.nsa</groupId>
+                                       <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
                                        <artifactId>dmaapClient</artifactId>
                                </exclusion>
                                <exclusion>

diff --combined PolicyEngineUtils/pom.xml
index 9bc811d,a3c8160..3db9c9e
--- 1/PolicyEngineUtils/pom.xml
--- 2/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@@ -23,7 -23,7 +23,7 @@@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
 -              <version>1.1.2-SNAPSHOT</version>
 +              <version>1.2.0-SNAPSHOT</version>
        </parent>
        <artifactId>PolicyEngineUtils</artifactId>
        <dependencies>
@@@ -124,9 -124,9 +124,9 @@@
                        <version>3.1.200</version>
                </dependency>
                <dependency>
-                       <groupId>com.att.nsa</groupId>
+                       <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
                        <artifactId>dmaapClient</artifactId>
-                       <version>0.2.12</version>
+                       <version>${dmaap.version}</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>org.slf4j</groupId>

diff --combined pom.xml
index edcbbaa,15f5baf..0eb2f43
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -11,7 -11,7 +11,7 @@@
  
        <groupId>org.onap.policy.engine</groupId>
        <artifactId>PolicyEngineSuite</artifactId>
 -      <version>1.1.2-SNAPSHOT</version>
 +      <version>1.2.0-SNAPSHOT</version>
        <packaging>pom</packaging>
        <name>policy-engine</name>
  
@@@ -30,6 -30,7 +30,7 @@@
                <releases.path>content/repositories/releases/</releases.path>
                <snapshots.path>content/repositories/snapshots/</snapshots.path>
                <staging.path>content/repositories/staging/</staging.path>
+               <dmaap.version>1.0.0</dmaap.version>
        </properties>