Merge "Fix SDWAN lan-portId set in service-data"

Former-commit-id: 68885623b91e7e4745b53df2393c53b37b00c6bb

diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml
index a05a6a0..98a603f 100644 (file)
--- a/SdncReports/SdncReportsApi/pom.xml
+++ b/SdncReports/SdncReportsApi/pom.xml
@@ -4,12 +4,12 @@
        <packaging>jar</packaging>
        <artifactId>SdncReportsApi</artifactId>
        <groupId>org.onap.sdnc.oam</groupId>
-       <version>1.5.1-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
         <name>sdnc-oam :: SdncReports :: SdncReportsApi</name>
        <parent>
                <groupId>org.onap.sdnc.oam</groupId>
                <artifactId>SdncReports</artifactId>
-               <version>1.5.1-SNAPSHOT</version>
+               <version>1.6.0-SNAPSHOT</version>
        </parent>
 
 

diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml
index bf372d8..2d318eb 100644 (file)
--- a/SdncReports/SdncReportsDao/pom.xml
+++ b/SdncReports/SdncReportsDao/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>SdncReportsDao</artifactId>
-       <version>1.5.1-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <packaging>jar</packaging>
 
         <name>sdnc-oam :: SdncReports :: SdncReportsDao</name>
@@ -11,7 +11,7 @@
        <parent>
                <groupId>org.onap.sdnc.oam</groupId>
                <artifactId>SdncReports</artifactId>
-               <version>1.5.1-SNAPSHOT</version>
+               <version>1.6.0-SNAPSHOT</version>
        </parent>
 
        <dependencies>

diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml
index d3bb662..27effb1 100644 (file)
--- a/SdncReports/pom.xml
+++ b/SdncReports/pom.xml
@@ -5,7 +5,7 @@
 
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>SdncReports</artifactId>
-       <version>1.5.1-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
         <name>sdnc-oam :: SdncReports</name>
@@ -13,7 +13,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>spring-boot-1-starter-parent</artifactId>
-               <version>1.2.2-SNAPSHOT</version>
+               <version>1.3.0-SNAPSHOT</version>
        </parent>
        <distributionManagement>
                <repository>

diff --git a/admportal/pom.xml b/admportal/pom.xml
index ea2a110..29f9ce9 100644 (file)
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>admportal</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: admportal</name>

diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml
index 6c018eb..a0e3539 100644 (file)
--- a/configbackuprestore/getBackupVnfDetailService/pom.xml
+++ b/configbackuprestore/getBackupVnfDetailService/pom.xml
@@ -4,11 +4,11 @@
        <parent>
                <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                <artifactId>configbackuprestore</artifactId>
-               <version>1.5.1-SNAPSHOT</version>
+               <version>1.6.0-SNAPSHOT</version>
        </parent>
        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
        <artifactId>getBackupVnfDetailService</artifactId>
-       <version>1.5.1-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <name>sdnc-oam :: vnfbackup :: getBackupVnfDetailService</name>
        <url>http://maven.apache.org</url>
        <properties>

diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml
index ba59ca0..a8f6b1b 100644 (file)
--- a/configbackuprestore/pom.xml
+++ b/configbackuprestore/pom.xml
@@ -5,14 +5,14 @@
 
        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
        <artifactId>configbackuprestore</artifactId>
-       <version>1.5.1-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <name>sdnc-oam :: vnfbackup</name>
        <packaging>pom</packaging>
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>spring-boot-1-starter-parent</artifactId>
-               <version>1.2.2-SNAPSHOT</version>
+               <version>1.3.0-SNAPSHOT</version>
        </parent>
 
        <properties>

diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml
index bd8792d..ecadf44 100644 (file)
--- a/configbackuprestore/vnfconfigbackupservice/pom.xml
+++ b/configbackuprestore/vnfconfigbackupservice/pom.xml
@@ -6,12 +6,12 @@
        <parent>
                <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                <artifactId>configbackuprestore</artifactId>
-               <version>1.5.1-SNAPSHOT</version>
+               <version>1.6.0-SNAPSHOT</version>
        </parent>
        
        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
        <artifactId>vnfconfigbackupservice</artifactId>
-       <version>1.5.1-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <name>sdnc-oam :: vnfbackup :: vnfconfigbackupservice</name>
        <url>http://maven.apache.org</url>
        
@@ -20,13 +20,13 @@
                <dependency>
                        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                        <artifactId>getBackupVnfDetailService</artifactId>
-                       <version>1.5.1-SNAPSHOT</version>
+                       <version>1.6.0-SNAPSHOT</version>
                </dependency>
                
                <dependency>
                        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                        <artifactId>vnfconfigreportsservice</artifactId>
-                       <version>1.5.1-SNAPSHOT</version>
+                       <version>1.6.0-SNAPSHOT</version>
                </dependency>
                
                <dependency>

diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml
index 232ba16..39ed4bb 100644 (file)
--- a/configbackuprestore/vnfconfigreportsservice/pom.xml
+++ b/configbackuprestore/vnfconfigreportsservice/pom.xml
@@ -4,11 +4,11 @@
        <parent>
                <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                <artifactId>configbackuprestore</artifactId>
-               <version>1.5.1-SNAPSHOT</version>
+               <version>1.6.0-SNAPSHOT</version>
        </parent>
        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
        <artifactId>vnfconfigreportsservice</artifactId>
-       <version>1.5.1-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <name>sdnc-oam :: vnfbackup :: vnfconfigreportservice</name>
        <url>http://maven.apache.org</url>
        <properties>

diff --git a/data-migrator/pom.xml b/data-migrator/pom.xml
index ff711ab..48d09fe 100644 (file)
--- a/data-migrator/pom.xml
+++ b/data-migrator/pom.xml
@@ -1,17 +1,16 @@
 <?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.sdnc.oam</groupId>
         <artifactId>sdnc-oam</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>data-migrator</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sdnc-oam :: data-migrator</name>

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 180cb92..8c7214e 100644 (file)
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-admportal</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates admportal Docker container</description>

diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index 0cda44e..0fbfd4a 100644 (file)
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-ansible-server</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ansible-server Docker container</description>

diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index ed029a5..54771e9 100644 (file)
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-dmaap-listener</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates dmaap-listener Docker container</description>

diff --git a/installation/pom.xml b/installation/pom.xml
index c66bfc6..01f8aa5 100644 (file)
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation</name>
     <description>Installs SDN-C on local file system</description>

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index b051d56..fdff669 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-sdnc</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates SDN Controller Docker container</description>
@@ -21,8 +21,8 @@
         <standalone.image.name>onap/sdnc-image</standalone.image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <sdnc.northbound.version>1.5.1-SNAPSHOT</sdnc.northbound.version>
-        <ccsdk.docker.version>0.4.2-STAGING-latest</ccsdk.docker.version>
+        <sdnc.northbound.version>1.6.0-SNAPSHOT</sdnc.northbound.version>
+        <ccsdk.docker.version>0.5.0-STAGING-latest</ccsdk.docker.version>
         <sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
         <sdnc.keypass><![CDATA[?w5&!M;8v1XF;:Xd;g*%S\$IY]]></sdnc.keypass>
         <sdnc.secureport>8443</sdnc.secureport>

diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 704dfec..e068909 100644 (file)
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-ueb-listener</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ueb-listener Docker container</description>

diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml
index 56e4b88..ae4419f 100644 (file)
--- a/platform-logic/datachange/pom.xml
+++ b/platform-logic/datachange/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-datachange</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml
index ca1959c..a7bf825 100644 (file)
--- a/platform-logic/generic-resource-api/pom.xml
+++ b/platform-logic/generic-resource-api/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-generic-resource-api</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json
index 380dfd0..d15b6f4 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.json
@@ -579,7 +579,7 @@
         "id": "384abebf.660182",\r
         "type": "switchNode",\r
         "name": "switch ActivateSiteInstance",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`\">\n    ",\r
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1658.5078411102295,\r
@@ -1878,7 +1878,7 @@
         "id": "e72e5636.3932b8",\r
         "type": "set",\r
         "name": "set IP params",\r
-        "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"prop.wan.ipAddress\" />\n<parameter name='prop.wan.providerIpAddress' value=\"prop.wan.provideripAddress\" />\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n<parameter name='prop.route.ipAddress' value=\"`$prop.wan.ipAddress`\" />\n\n",\r
+        "xml": "<set>\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n\n\n",\r
         "comments": "",\r
         "x": 2257.29248046875,\r
         "y": 1043.8992919921875,\r
@@ -1889,7 +1889,7 @@
         "id": "413a8e72.8c216",\r
         "type": "set",\r
         "name": "set IP params",\r
-        "xml": "<set>\n<parameter name='prop.wan.ip-address' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n\n\n\n",\r
+        "xml": "<set>\n<parameter name='prop.wan.ipAddress' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n\n\n\n",\r
         "comments": "",\r
         "x": 2254.754150390625,\r
         "y": 1158,\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml
index 40b1896..288dd5d 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-wanport-activate.xml
@@ -129,7 +129,7 @@
                                     </block>\r
                                 </outcome>\r
                             </switch>\r
-                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`">\r
+                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
                                 <outcome value='true'>\r
                                     <set>\r
                                         <parameter name='tmp.siteVidx' value='`$idx`' />\r
@@ -346,11 +346,9 @@
                                     <outcome value='true'>\r
                                         <block atomic="true">\r
                                             <set>\r
-                                                <parameter name='prop.wan.ip-address' value="prop.wan.ipAddress" />\r
-                                                <parameter name='prop.wan.providerIpAddress' value="prop.wan.provideripAddress" />\r
                                                 <parameter name='prop.wan.IpMode' value="static" />\r
+                                                <parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />\r
                                                 <parameter name='prop.route.nextHopType' value="ip-address" />\r
-                                                <parameter name='prop.route.ipAddress' value="`$prop.wan.ipAddress`" />\r
                                             </set>\r
                                             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port-static.json'`" />\r
@@ -383,7 +381,7 @@
                                     <outcome value='true'>\r
                                         <block atomic="true">\r
                                             <set>\r
-                                                <parameter name='prop.wan.ip-address' value="" />\r
+                                                <parameter name='prop.wan.ipAddress' value="" />\r
                                                 <parameter name='prop.wan.prefixLength' value="" />\r
                                                 <parameter name='prop.wan.providerIpAddress' value="" />\r
                                                 <parameter name='prop.wan.IpMode' value="DHCP" />\r

diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index a72fa3d..de6500d 100644 (file)
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.2-SNAPSHOT</version>
+               <version>1.3.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>platform-logic-installer</artifactId>
-       <version>1.5.1-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml
index 22eb640..923daf7 100644 (file)
--- a/platform-logic/lcm/pom.xml
+++ b/platform-logic/lcm/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.2-SNAPSHOT</version>
+               <version>1.3.0-SNAPSHOT</version>
         <relativePath/>
        </parent>
 
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>platform-logic-lcm</artifactId>
-       <version>1.5.1-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index 6384115..6ee01b3 100644 (file)
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic</name>

diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index 47efea1..3794860 100644 (file)
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-restapi-templates</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml
index 2cce173..16f92af 100644 (file)
--- a/platform-logic/restconfapi-yang/pom.xml
+++ b/platform-logic/restconfapi-yang/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-restconfapi-yang</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index d4c59ba..c9d9c5f 100644 (file)
--- a/platform-logic/setup/pom.xml
+++ b/platform-logic/setup/pom.xml
@@ -5,13 +5,13 @@
        <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>platform-logic-setup</artifactId>
-       <version>1.5.1-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml
index 66b8752..8b0c667 100644 (file)
--- a/platform-logic/vnfapi/pom.xml
+++ b/platform-logic/vnfapi/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.2-SNAPSHOT</version>
+               <version>1.3.0-SNAPSHOT</version>
         <relativePath/>
        </parent>
 
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>platform-logic-vnfapi</artifactId>
-       <version>1.5.1-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>

diff --git a/pom.xml b/pom.xml
index a28819f..054d3e5 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.2-SNAPSHOT</version>
+               <version>1.3.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>sdnc-oam</artifactId>
-       <version>1.5.1-SNAPSHOT</version>
+       <version>1.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-oam</name>

diff --git a/version.properties b/version.properties
index 423a329..c5201d2 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 release_name=1
-sprint_number=5
-feature_revision=1
+sprint_number=6
+feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}