Merge "Modified dmaapClient dependency GroupId/Version"

diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 94765a7..6f530b3 100644 (file)
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -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 --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index 06b7601..7602294 100644 (file)
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -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 --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 9bc811d..3db9c9e 100644 (file)
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -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 --git a/pom.xml b/pom.xml
index edcbbaa..0eb2f43 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +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>