add aafshiro feature dependency

[ccsdk/distribution.git] / odlsli / odlsli-ubuntu / pom.xml

diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
index ba6ad07..6cc7117 100644 (file)
--- a/odlsli/odlsli-ubuntu/pom.xml
+++ b/odlsli/odlsli-ubuntu/pom.xml
@@ -1,30 +1,30 @@
 <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
+               <version>1.2.2-SNAPSHOT</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>distribution-odlsli-ubuntu</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
+       <version>0.4.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
-       <name>ccsdk-distribution :: odlsli</name>
-       <description>Creates SDN Controller Docker container</description>
+       <name>ccsdk-distribution :: odlsli-ubuntu</name>
+       <description>Creates Ubuntu-based ODLSLI  Docker container</description>
        <organization>
                <name>openECOMP</name>
        </organization>
 
        <properties>
+           <base.image.name>onap/ccsdk-odl-fluorine-ubuntu-image</base.image.name>
                <image.name>onap/ccsdk-odlsli-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>
@@ -32,6 +32,9 @@
                <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>
        </properties>
 
        <dependencies>
@@ -106,6 +109,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>
@@ -113,6 +123,13 @@
                        <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>
@@ -122,7 +139,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>
@@ -183,6 +200,13 @@
                        <classifier>repo</classifier>
                        <type>zip</type>
                </dependency>
+               <dependency>
+                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
+                       <artifactId>template-node-installer</artifactId>
+                       <version>${ccsdk.sli.plugins.version}</version>
+                       <classifier>repo</classifier>
+                       <type>zip</type>
+               </dependency>
                <dependency>
                        <groupId>org.onap.ccsdk.sli.plugins</groupId>
                        <artifactId>restconf-client-installer</artifactId>
@@ -218,6 +242,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>
@@ -242,22 +280,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>
@@ -497,9 +520,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>