From 632987493c6c24532b2ec526b17daf73ee6d21f0 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dt5972@att.com>
Date: Thu, 1 Mar 2018 10:59:28 -0500
Subject: Nitrogen port : sdnc-oam

Update sdnc-oam to create docker containers based on
ODL Nitrogen release.

Change-Id: If8df28c417a2dec69be6eee2fc4521541126085a
Issue-ID: SDNC-269
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>

Former-commit-id: 2822ea7882e20879b1556bf98cf28695f5052348
---
 installation/dmaap-listener/pom.xml | 47 +++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 20 deletions(-)

(limited to 'installation/dmaap-listener')

diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index c894a249..1e4cafa6 100644
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -3,23 +3,21 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <groupId>org.onap.sdnc.oam</groupId>
-        <artifactId>installation</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <artifactId>installation-dmaap-listener</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
 
-    <name>Installation - dmaap-listener</name>
+    <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates dmaap-listener Docker container</description>
 
     <properties>
         <image.name>onap/sdnc-dmaap-listener-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
-        <ccsdk.project.version>0.1.0</ccsdk.project.version>
-	<ccsdk.sli.northbound.version>0.1.1</ccsdk.sli.northbound.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
     </properties>
 
@@ -39,20 +37,29 @@
                         </goals>
                         <configuration>
                             <source>
-                                println project.properties['sdnc.project.version'];
+                                println
+                                project.properties['sdnc.project.version'];
                                 def versionArray;
-                                if ( project.properties['sdnc.project.version'] != null ) {
-                                    versionArray = project.properties['sdnc.project.version'].split('\\.');
+                                if (
+                                project.properties['sdnc.project.version']
+                                != null ) {
+                                versionArray = project.properties['sdnc.project.version'].split('\\.');
                                 }
 
-                                if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT"))
+                                if
+                                (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT"))
                                 {
-                                    project.properties['project.docker.latesttag.version']=versionArray[0]  + '.' + versionArray[1] + "-STAGING-latest";
+                                project.properties['project.docker.latesttag.version']=versionArray[0]
+                                + '.' + versionArray[1] +
+                                "-STAGING-latest";
                                 } else {
-                                    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                project.properties['project.docker.latesttag.version']=versionArray[0]
+                                + '.' + versionArray[1] +
+                                "-STAGING-latest";
                                 }
 
-                                println 'New Tag for docker:' +
+                                println 'New Tag for
+                                docker:' +
                                 project.properties['project.docker.latesttag.version'];
                             </source>
                         </configuration>
@@ -140,12 +147,12 @@
                         <phase>initialize</phase>
                         <configuration>
                             <artifactItems>
-                              <artifactItem>
-                                <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                                <artifactId>dmaap-listener</artifactId>
-                                <type>zip</type>
-                                <version>${ccsdk.sli.northbound.version}</version>
-                              </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.onap.ccsdk.sli.northbound</groupId>
+                                    <artifactId>dmaap-listener</artifactId>
+                                    <type>zip</type>
+                                    <version>${ccsdk.sli.northbound.version}</version>
+                                </artifactItem>
                             </artifactItems>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/dmaap-listener</outputDirectory>
                             <excludes>bin/**,**/*-javadoc.jar,**/*-sources.jar</excludes>
-- 
cgit 1.2.3-korg