X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fodlsli-alpine%2Fpom.xml;h=3c4080a0221f96664ec886085217ecf3970e7d69;hp=29ee8082a9b347be990d0b3ab5cc5a0c68e79ee7;hb=a47d41e17d31ad7f58c6fcb8a41853f8301dfd11;hpb=df56c579a469fbf81efd164b8b77bcef46618aaa

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 29ee8082..3c4080a0 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,31 +5,41 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.2.0</version>
+		<version>1.4.1-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.distribution</groupId>
 	<artifactId>distribution-odlsli-alpine</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
+	<version>0.6.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-distribution :: odlsli-alpine</name>
-	<description>Creates SDN Controller Docker container</description>
+	<description>Creates Alpine-based ODLSLI Docker container</description>
 	<organization>
 		<name>openECOMP</name>
 	</organization>
 
 	<properties>
+	    <base.image.name>onap/ccsdk-odl-neon-alpine-image</base.image.name>
 		<image.name>onap/ccsdk-odlsli-alpine-image</image.name>
 		<ccsdk.project.version>${project.version}</ccsdk.project.version>
-		<ccsdk.features.version>${project.version}</ccsdk.features.version>
+		<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+		<ccsdk.features.version>0.6.1-SNAPSHOT</ccsdk.features.version>
 		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 		<opendaylight.root>opt/opendaylight</opendaylight.root>
 		<docker.push.phase>deploy</docker.push.phase>
 		<docker.verbose>true</docker.verbose>
 		<ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
+		<odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040</odl.features.extra>
+		<ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features>
+		<odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
+		
+		<ccsdk.sli.core.version>0.6.1-SNAPSHOT</ccsdk.sli.core.version>
+		<ccsdk.sli.adaptors.version>0.6.1-SNAPSHOT</ccsdk.sli.adaptors.version>
+		<ccsdk.sli.northbound.version>0.6.1-SNAPSHOT</ccsdk.sli.northbound.version>
+		<ccsdk.sli.plugins.version>0.6.1-SNAPSHOT</ccsdk.sli.plugins.version>
 	</properties>
 
 	<dependencies>
@@ -104,6 +114,13 @@
 			<classifier>repo</classifier>
 			<type>zip</type>
 		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
+			<artifactId>base-http-installer</artifactId>
+			<version>${ccsdk.sli.adaptors.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
 			<artifactId>mdsal-resource-installer</artifactId>
@@ -111,6 +128,20 @@
 			<classifier>repo</classifier>
 			<type>zip</type>
 		</dependency>
+		<dependency>
+		    <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
+		    <artifactId>publisher.installer</artifactId>
+		    <version>${ccsdk.sli.adaptors.version}</version>
+		    <classifier>repo</classifier>
+		    <type>zip</type>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
+			<artifactId>netbox-client-installer</artifactId>
+			<version>${ccsdk.sli.adaptors.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
 			<artifactId>resource-assignment-installer</artifactId>
@@ -120,7 +151,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
-			<artifactId>netbox-client-installer</artifactId>
+			<artifactId>saltstack-adapter-installer</artifactId>
 			<version>${ccsdk.sli.adaptors.version}</version>
 			<classifier>repo</classifier>
 			<type>zip</type>
@@ -139,6 +170,7 @@
 			<classifier>repo</classifier>
 			<type>zip</type>
 		</dependency>
+
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.northbound</groupId>
 			<artifactId>asdcApi-installer</artifactId>
@@ -223,6 +255,35 @@
 			<classifier>repo</classifier>
 			<type>zip</type>
 		</dependency>
+	        <dependency>
+        		<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+			<artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
+	            	<version>${ccsdk.features.version}</version>
+	            	<classifier>repo</classifier>
+	            	<type>zip</type>
+	        </dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.features</groupId>
+			<artifactId>aafshiro-installer</artifactId>
+			<version>${ccsdk.features.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+	        </dependency>
+		<dependency>
+      <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
+      <artifactId>sdnr-northbound-features-installer</artifactId>
+      <version>${ccsdk.features.version}</version>
+      <classifier>repo</classifier>
+      <type>zip</type>
+    </dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
+			<artifactId>oofpcipoc-installer</artifactId>
+			<version>${ccsdk.features.version}</version>
+			<classifier>repo</classifier>
+			<type>zip</type>
+		</dependency>
+
 	</dependencies>
 
 	<build>
@@ -247,22 +308,7 @@
 							<goal>execute</goal>
 						</goals>
 						<configuration>
-							<source>
-								println project.properties['ccsdk.project.version'];
-								def versionArray;
-								if (project.properties['ccsdk.project.version'] != null ) {
-								    versionArray = project.properties['ccsdk.project.version'].split('\\.');
-								}
-
-								if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
-								{
-								    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";
-								}
-
-								println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
-							</source>
+							<source>${basedir}/../../src/main/scripts/TagVersion.groovy</source>
 						</configuration>
 					</execution>
 				</executions>
@@ -387,6 +433,7 @@
 									<directory>../src/main/properties</directory>
 									<includes>
 										<include>*.properties</include>
+										<include>*.vt</include>
 									</includes>
 									<filtering>false</filtering>
 								</resource>
@@ -491,7 +538,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>
@@ -500,11 +547,11 @@
 									<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>
-											<tag>${project.docker.latesttag.version}</tag>
+											<tag>${project.docker.latestminortag.version}</tag>
+											<tag>${project.docker.latestfulltag.version}</tag>
+											<tag>${project.docker.latesttagtimestamp.version}</tag>
 										</tags>
 									</build>
 								</image>