X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc%2Fpom.xml;h=9c69c9eb1e9779cacddfa4eccc2a183ccbfa10a4;hb=96aa089f6dd9da04f241c0d1077ffb2095a101fb;hp=bc2494c25c40e6374f6e62546c58aa6b4a73a487;hpb=6ddeb29d894c03facb4b29e81611da0be10ca6fd;p=sdnc%2Foam.git

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index bc2494c2..9c69c9eb 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.0.2-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>installation-sdnc</artifactId>
-	<version>1.3.2-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 
 	<name>sdnc-oam :: installation :: ${project.artifactId}</name>
 	<description>Creates SDN Controller Docker container</description>
@@ -20,43 +19,44 @@
 	<properties>
 		<image.name>onap/sdnc-image</image.name>
 		<sdnc.project.version>${project.version}</sdnc.project.version>
-		<sdnc.northbound.version>1.3.2-SNAPSHOT</sdnc.northbound.version>
+		<sdnc.northbound.version>1.5.0-SNAPSHOT</sdnc.northbound.version>
+        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
 		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+		<docker.push.phase>deploy</docker.push.phase>
+		<docker.verbose>true</docker.verbose>
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 	</properties>
 
-    <dependencies>
-    		<dependency>
-    			<groupId>org.onap.sdnc.northbound</groupId>
-    			<artifactId>generic-resource-api-installer</artifactId>
-    			<version>${sdnc.northbound.version}</version>
-    			<type>zip</type>
-    		</dependency>
-    		<dependency>
-    			<groupId>org.onap.sdnc.northbound</groupId>
-    			<artifactId>vnfapi-installer</artifactId>
-    			<version>${sdnc.northbound.version}</version>
-    			<type>zip</type>
-    		</dependency>
-    		<dependency>
-    			<groupId>org.onap.sdnc.northbound</groupId>
-    			<artifactId>vnftools-installer</artifactId>
-    			<version>${sdnc.northbound.version}</version>
-    			<type>zip</type>
-    		</dependency>
-    		<dependency>
-    			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
-    			<artifactId>ansible-adapter-installer</artifactId>
-    			<version>${ccsdk.sli.adaptors.version}</version>
-    			<type>zip</type>
-    		</dependency>
-    		<dependency>
-    			<groupId>org.onap.ccsdk.sli.northbound</groupId>
-    			<artifactId>lcm-installer</artifactId>
-    			<version>${ccsdk.sli.northbound.version}</version>
-    			<type>zip</type>
-    		</dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.onap.sdnc.northbound</groupId>
+			<artifactId>generic-resource-api-installer</artifactId>
+			<version>${sdnc.northbound.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdnc.northbound</groupId>
+			<artifactId>vnfapi-installer</artifactId>
+			<version>${sdnc.northbound.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdnc.northbound</groupId>
+			<artifactId>vnftools-installer</artifactId>
+			<version>${sdnc.northbound.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdnc.northbound</groupId>
+			<artifactId>sdnc-northbound-features-installer</artifactId>
+			<version>${sdnc.northbound.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
+	</dependencies>
 
 	<build>
 		<plugins>
@@ -95,7 +95,7 @@
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.16.5</version>
+				<version>0.28.0</version>
 				<inherited>false</inherited>
 				<configuration>
 					<images>
@@ -104,7 +104,7 @@
 							<build>
 								<cleanup>try</cleanup>
 								<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-								<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+								<dockerFile>Dockerfile</dockerFile>
 								<tags>
 									<tag>${project.version}</tag>
 									<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
@@ -125,7 +125,7 @@
 
 					<execution>
 						<id>push-images</id>
-						<phase>deploy</phase>
+						<phase>${docker.push.phase}</phase>
 						<goals>
 							<goal>build</goal>
 							<goal>push</goal>
@@ -266,26 +266,13 @@
 				<version>3.0.2</version>
 				<executions>
 					<execution>
-						<id>unpack-sdnc-features</id>
+						<id>unpack sdnc features</id>
 						<phase>generate-sources</phase>
 						<goals>
 							<goal>unpack-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/features</outputDirectory>
-							<includeGroupIds>org.onap.sdnc</includeGroupIds>
-							<excludeTransitive>true</excludeTransitive>
-						</configuration>
-					</execution>
-					<execution>
-						<id>unpack-extra-ccsdk-features</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>unpack-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/features</outputDirectory>
-							<includeGroupIds>org.onap.ccsdk</includeGroupIds>
+							<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
 							<excludeTransitive>true</excludeTransitive>
 						</configuration>
 					</execution>
@@ -343,6 +330,6 @@
 
 	</build>
 	<organization>
-		<name>openECOMP</name>
+		<name>ONAP</name>
 	</organization>
 </project>