<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.5.1</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odlsli-alpine</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: odlsli-alpine</name>
</organization>
<properties>
- <base.image.name>onap/ccsdk-odl-fluorine-alpine-image</base.image.name>
+ <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.7.0-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.7.0-SNAPSHOT</ccsdk.sli.core.version>
+ <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
+ <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
+ <ccsdk.sli.plugins.version>0.7.0-SNAPSHOT</ccsdk.sli.plugins.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<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>
<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>
</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>
<classifier>repo</classifier>
<type>zip</type>
</dependency>
+
<dependency>
<groupId>org.onap.ccsdk.sli.northbound</groupId>
<artifactId>asdcApi-installer</artifactId>
<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>
+ <dependency>
+ <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
+ <artifactId>a1Adapter-installer</artifactId>
+ <version>${ccsdk.features.version}</version>
+ <classifier>repo</classifier>
+ <type>zip</type>
+ </dependency>
</dependencies>
<build>
<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>
<directory>../src/main/properties</directory>
<includes>
<include>*.properties</include>
+ <include>*.vt</include>
</includes>
<filtering>false</filtering>
</resource>
<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>
<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>