Roll to next snapshot

[sdnc/oam.git] / installation / sdnc / pom.xml

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 1c15e23..1ff10b9 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -1,18 +1,19 @@
 <?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"
+<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.3</version>
+               <version>1.1.3-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>installation-sdnc</artifactId>
-       <version>1.3.3-SNAPSHOT</version>
+       <version>1.4.3-SNAPSHOT</version>
 
        <name>sdnc-oam :: installation :: ${project.artifactId}</name>
        <description>Creates SDN Controller Docker container</description>
@@ -20,43 +21,47 @@
        <properties>
                <image.name>onap/sdnc-image</image.name>
                <sdnc.project.version>${project.version}</sdnc.project.version>
-               <sdnc.northbound.version>1.3.2</sdnc.northbound.version>
+               <sdnc.northbound.version>1.4.2</sdnc.northbound.version>
+               <ccsdk.docker.version>0.3.2</ccsdk.docker.version>
+               <sdnc.keystore>keystore.sdnc.p12</sdnc.keystore>
+               <sdnc.keypass>onap3.0</sdnc.keypass>
+               <sdnc.secureport>8443</sdnc.secureport>
                <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>
@@ -76,10 +81,11 @@
                                                                println project.properties['sdnc.project.version'];
                                                                def versionArray;
                                                                if ( project.properties['sdnc.project.version'] != null ) {
-                                                                  versionArray = project.properties['sdnc.project.version'].split('\\.');
+                                                                   versionArray = project.properties['sdnc.project.version'].split('\\.');
                                                                }
 
-                                                               if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
+                                                               if (project.properties['sdnc.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";
@@ -125,7 +131,7 @@
 
                                        <execution>
                                                <id>push-images</id>
-                                               <phase>deploy</phase>
+                                               <phase>${docker.push.phase}</phase>
                                                <goals>
                                                        <goal>build</goal>
                                                        <goal>push</goal>
@@ -266,26 +272,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 +336,6 @@
 
        </build>
        <organization>
-               <name>openECOMP</name>
+               <name>ONAP</name>
        </organization>
 </project>