From b2175581c55981e2eb039f3543baffe76d13394d Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 31 Mar 2017 17:47:19 -0400
Subject: [SDNC-5] Rebase sdnc-oam

Port to OpenDaylight Boron and sync updates since 16.10

Change-Id: I9f6febe0bd3d50c3d27c775e5a41806ee3d2e6cb
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: c7fb7db31a50d5f0005251d41f497fbd4fb2ae4b
---
 installation/dgbuilder/pom.xml | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'installation/dgbuilder/pom.xml')

diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index daef9865..f7a6375d 100644
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -18,7 +18,7 @@
 	<description>Creates docker container for dgbuilder</description>
 
 	<properties>
-		<image.name>ecomp/dgbuilder-sdnc-image</image.name>
+		<image.name>openecomp/dgbuilder-sdnc-image</image.name>
 	</properties>
 
 
@@ -51,7 +51,7 @@
 				<executions>
 					<execution>
 						<id>generate-images</id>
-						<phase>process-sources</phase>
+						<phase>generate-sources</phase>
 						<goals>
 							<goal>build</goal>
 						</goals>
@@ -98,20 +98,21 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<version>1.5.0</version>
 				<executions>
-					<execution>
-						<id>make-path</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>/bin/mkdir</executable>
-							<arguments>
-								<argument>-p</argument>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
-							</arguments>
-						</configuration>
-					</execution>
+                    			<execution>
+                        			<id>Unzip dgbuilder</id>
+                        			<phase>generate-sources</phase>
+                        			<goals>
+                            				<goal>exec</goal>
+                        			</goals>
+                        			<configuration>
+                            				<executable>/usr/bin/unzip</executable>
+                            				<arguments>
+                                			<argument>-d</argument>
+                                			<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+                                			<argument>../../dgbuilder/target/*.zip</argument>
+                            				</arguments>
+                        			</configuration>
+                    			</execution>
 					<execution>
 						<id>Copy dgbuilder</id>
 						<phase>generate-sources</phase>
@@ -137,7 +138,7 @@
 						<configuration>
 							<executable>/bin/bash</executable>
 							<arguments>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/dgbuilder/createReleaseDir</argument>
+								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/dgbuilder/createReleaseDir.sh</argument>
 								<argument>1702</argument>
 								<argument>dguser</argument>
 								<argument>change_email_id@dgbuilder.com</argument>
@@ -147,7 +148,7 @@
 
 					<execution>
 						<id>change shell permissions</id>
-						<phase>process-sources</phase>
+                        			<phase>process-sources</phase>
 						<goals>
 							<goal>exec</goal>
 						</goals>
-- 
cgit 1.2.3-korg