From 7de29bfea89ff53a446bea07d8f74d1aaa87045b Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Wed, 25 Nov 2020 08:29:23 -0500
Subject: Limit use of odlparent poms

Updated pom.xmls to use standard maven project structure (i.e. parent
of pom is pom in directory above), and updated top level pom to
use org.ccsdk.parent:oparent as parent - EXCEPT in cases where
module has true OpenDaylight dependencies and therefore needs
to use ODL parent pom.

Change-Id: I50429f28225152251ac2086235c14bb00f09c05c
Issue-ID: CCSDK-3001
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 northbound/dmaap-listener/pom.xml                  | 25 ++++++++++++++++++++--
 .../dmaapclient/SdncDmaapConsumerImpl.java         |  6 +++---
 2 files changed, 26 insertions(+), 5 deletions(-)

(limited to 'northbound/dmaap-listener')

diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml
index fcc069607..fb0724989 100755
--- a/northbound/dmaap-listener/pom.xml
+++ b/northbound/dmaap-listener/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>standalone-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
@@ -23,6 +23,8 @@
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <build.number>${maven.build.timestamp}</build.number>
         <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
+        <!-- dmaap client requires an older jersey version -->
+        <jersey.version>2.22.1</jersey.version>
 
     </properties>
 
@@ -49,6 +51,7 @@
         <dependency>
             <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
             <artifactId>dmaapClient</artifactId>
+            <version>1.1.12</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -70,10 +73,28 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
         </dependency>
+
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-common</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-client</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java b/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java
index ee8bb4d6e..60925120c 100644
--- a/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java
+++ b/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java
@@ -27,9 +27,9 @@ import java.io.FileInputStream;
 import java.util.Properties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRConsumer;
-import com.att.nsa.mr.client.response.MRConsumerResponse;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRConsumer;
+import org.onap.dmaap.mr.client.response.MRConsumerResponse;
 
 public abstract class SdncDmaapConsumerImpl implements SdncDmaapConsumer {
 
-- 
cgit 1.2.3-korg