X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fodlsli-alpine%2Fpom.xml;h=edb85c6582468ad75fd728c2855b7c6b88be7504;hp=6c9a18279f658520e9f3bee17cd000f24ac098e1;hb=c4acdc6d2f3e4c0c7fc36433a1ce5033b9daf32d;hpb=dbc7a4ded01499f590e48d565152d5dc06a2aa82

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 6c9a1827..edb85c65 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.2-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.distribution</groupId>
 	<artifactId>distribution-odlsli-alpine</artifactId>
-	<version>0.4.1-SNAPSHOT</version>
+	<version>0.4.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-distribution :: odlsli-alpine</name>
@@ -24,6 +24,7 @@
 	    <base.image.name>onap/ccsdk-odl-fluorine-alpine-image</base.image.name>
 		<image.name>onap/ccsdk-odlsli-alpine-image</image.name>
 		<ccsdk.project.version>${project.version}</ccsdk.project.version>
+		<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
 		<ccsdk.features.version>${project.version}</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>
@@ -31,6 +32,13 @@
 		<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>
+		-->
+		<ccsdk.adaptors.features>ccsdk-aai-service,ccsdk-ansible-adapter,ccsdk-grpc-client,ccsdk-netbox-client,csdk-mdsal-resource,ccsdk-resource-assignment,ccsdk-sql-resource</ccsdk.adaptors.features>
+		<ccsdk.odl.features>ccsdk-sli-core-all,${ccsdk.adaptors.features},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>
 	</properties>
 	
 	<dependencies>
@@ -105,6 +113,13 @@
 			<classifier>repo</classifier>
 			<type>zip</type>
 		</dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>grpc-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>mdsal-resource-installer</artifactId>
@@ -140,13 +155,13 @@
 			<classifier>repo</classifier>
 			<type>zip</type>
 		</dependency>
-		<dependency>
+<!-- 		<dependency>
 			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
 			<artifactId>sliadaptors-features-installer</artifactId>
 			<version>${ccsdk.sli.adaptors.version}</version>
 			<classifier>repo</classifier>
 			<type>zip</type>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.northbound</groupId>
 			<artifactId>asdcApi-installer</artifactId>
@@ -231,6 +246,20 @@
 			<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>
 	</dependencies>
 
 	<build>
@@ -255,22 +284,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>
@@ -510,9 +524,9 @@
 										<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
 										<dockerFile>${basedir}/target/docker-stage/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>