Roll to initial Dublin snapshot

Roll to initial Dublin snapshot

Change-Id: Id36b1e41ae75a7c282a5db85b30abe3a7688aeb9
Issue-ID: SDNC-480
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Fix CCSDK docker version

Update CCSDK docker versions used to build SDNC docker containers.

Change-Id: I9497c788cc48b401f24aeb9018060c6c0d5b4a0b
Issue-ID: SDNC-486
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Former-commit-id: c261e3f719abcbea0762162dc9244f951296c6a1

diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml
index b6cb948..8d3caab 100644 (file)
--- a/SdncReports/SdncReportsApi/pom.xml
+++ b/SdncReports/SdncReportsApi/pom.xml
@@ -5,12 +5,12 @@
        <packaging>jar</packaging>
        <artifactId>SdncReportsApi</artifactId>
        <groupId>org.onap.sdnc.oam</groupId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
         <name>sdnc-oam :: SdncReports :: SdncReportsApi</name>
        <parent>
                <groupId>org.onap.sdnc.oam</groupId>
                <artifactId>SdncReports</artifactId>
-               <version>1.4.1-SNAPSHOT</version>
+               <version>1.5.0-SNAPSHOT</version>
        </parent>
 
 

diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml
index 2278f60..3a93e39 100644 (file)
--- a/SdncReports/SdncReportsDao/pom.xml
+++ b/SdncReports/SdncReportsDao/pom.xml
@@ -4,7 +4,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>SdncReportsDao</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
        <packaging>jar</packaging>
 
         <name>sdnc-oam :: SdncReports :: SdncReportsDao</name>
@@ -12,7 +12,7 @@
        <parent>
                <groupId>org.onap.sdnc.oam</groupId>
                <artifactId>SdncReports</artifactId>
-               <version>1.4.1-SNAPSHOT</version>
+               <version>1.5.0-SNAPSHOT</version>
        </parent>
 
        <dependencies>

diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml
index fd74e76..026f961 100644 (file)
--- a/SdncReports/pom.xml
+++ b/SdncReports/pom.xml
@@ -6,7 +6,7 @@
 
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>SdncReports</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
         <name>sdnc-oam :: SdncReports</name>
@@ -14,7 +14,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>spring-boot-1-starter-parent</artifactId>
-               <version>1.1.1</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
        <distributionManagement>
                <repository>

diff --git a/admportal/pom.xml b/admportal/pom.xml
index 1bdc96d..6c390aa 100644 (file)
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>admportal</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: admportal</name>

diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml
index 04055b9..1f00a10 100644 (file)
--- a/configbackuprestore/getBackupVnfDetailService/pom.xml
+++ b/configbackuprestore/getBackupVnfDetailService/pom.xml
@@ -7,11 +7,11 @@
        <parent>
                <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                <artifactId>configbackuprestore</artifactId>
-               <version>1.4.1-SNAPSHOT</version>
+               <version>1.5.0-SNAPSHOT</version>
        </parent>
        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
        <artifactId>getBackupVnfDetailService</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.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 9608a21..035c616 100644 (file)
--- a/configbackuprestore/pom.xml
+++ b/configbackuprestore/pom.xml
@@ -7,14 +7,14 @@
 
        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
        <artifactId>configbackuprestore</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.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.1.1</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <properties>

diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml
index e96b5a0..606062e 100644 (file)
--- a/configbackuprestore/vnfconfigbackupservice/pom.xml
+++ b/configbackuprestore/vnfconfigbackupservice/pom.xml
@@ -8,12 +8,12 @@
        <parent>
                <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                <artifactId>configbackuprestore</artifactId>
-               <version>1.4.1-SNAPSHOT</version>
+               <version>1.5.0-SNAPSHOT</version>
        </parent>
        
        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
        <artifactId>vnfconfigbackupservice</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
        <name>sdnc-oam :: vnfbackup :: vnfconfigbackupservice</name>
        <url>http://maven.apache.org</url>
        
@@ -22,13 +22,13 @@
                <dependency>
                        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                        <artifactId>getBackupVnfDetailService</artifactId>
-                       <version>1.4.1-SNAPSHOT</version>
+                       <version>1.5.0-SNAPSHOT</version>
                </dependency>
                
                <dependency>
                        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                        <artifactId>vnfconfigreportsservice</artifactId>
-                       <version>1.4.1-SNAPSHOT</version>
+                       <version>1.5.0-SNAPSHOT</version>
                </dependency>
                
                <dependency>

diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml
index 8182b8a..b84886f 100644 (file)
--- a/configbackuprestore/vnfconfigreportsservice/pom.xml
+++ b/configbackuprestore/vnfconfigreportsservice/pom.xml
@@ -7,11 +7,11 @@
        <parent>
                <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
                <artifactId>configbackuprestore</artifactId>
-               <version>1.4.1-SNAPSHOT</version>
+               <version>1.5.0-SNAPSHOT</version>
        </parent>
        <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
        <artifactId>vnfconfigreportsservice</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
        <name>sdnc-oam :: vnfbackup :: vnfconfigreportservice</name>
        <url>http://maven.apache.org</url>
        <properties>

diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index 74eb731..99289e8 100644 (file)
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.1</version>
+               <version>1.2.0-SNAPSHOT</version>
         <relativePath />
        </parent>
 
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>dgbuilder</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-oam :: dgbuilder</name>

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 5a8e3c6..7cd1f47 100644 (file)
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -5,14 +5,14 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.1</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>installation-admportal</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
 
        <name>sdnc-oam :: installation :: ${project.artifactId}</name>
        <description>Creates admportal Docker container</description>
@@ -20,6 +20,7 @@
        <properties>
                <image.name>onap/admportal-sdnc-image</image.name>
                <sdnc.project.version>${project.version}</sdnc.project.version>
+               <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
        </properties>
 

diff --git a/installation/admportal/src/main/docker/Dockerfile b/installation/admportal/src/main/docker/Dockerfile
index fadb812..abaa056 100644 (file)
--- a/installation/admportal/src/main/docker/Dockerfile
+++ b/installation/admportal/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version}
+FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version}
 MAINTAINER SDN-C Team (sdnc@lists.openecomp.org)
 
 # create link for pm2

diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index b9e88cb..0ec328e 100644 (file)
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.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.4.1-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ansible-server Docker container</description>
@@ -19,6 +19,7 @@
     <properties>
         <image.name>onap/sdnc-ansible-server-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
+        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>

diff --git a/installation/ansible-server/src/main/docker/Dockerfile b/installation/ansible-server/src/main/docker/Dockerfile
index ea9e61b..0e59fba 100644 (file)
--- a/installation/ansible-server/src/main/docker/Dockerfile
+++ b/installation/ansible-server/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ansible-server-image:${ccsdk.distribution.version}
+FROM onap/ccsdk-ansible-server-image:${ccsdk.docker.version}
 
 LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)"
 

diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index c9e9d79..6ddd1eb 100644 (file)
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.1</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index 09f6048..7878df5 100644 (file)
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.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.4.1-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates dmaap-listener Docker container</description>
@@ -19,6 +19,7 @@
     <properties>
         <image.name>onap/sdnc-dmaap-listener-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
+        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>

diff --git a/installation/dmaap-listener/src/main/docker/Dockerfile b/installation/dmaap-listener/src/main/docker/Dockerfile
index 49a70e4..28676fa 100644 (file)
--- a/installation/dmaap-listener/src/main/docker/Dockerfile
+++ b/installation/dmaap-listener/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version}
+FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version}
 MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties

diff --git a/installation/pom.xml b/installation/pom.xml
index 65ead6f..383c676 100644 (file)
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.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 82a9819..4202e53 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -5,14 +5,14 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.1</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>installation-sdnc</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
 
        <name>sdnc-oam :: installation :: ${project.artifactId}</name>
        <description>Creates SDN Controller Docker container</description>
@@ -21,6 +21,7 @@
                <image.name>onap/sdnc-image</image.name>
                <sdnc.project.version>${project.version}</sdnc.project.version>
                <sdnc.northbound.version>1.4.1</sdnc.northbound.version>
+        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
                <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
                <docker.push.phase>deploy</docker.push.phase>
                <docker.verbose>true</docker.verbose>

diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 13a644e..89e2aa0 100755 (executable)
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-odlsli-image:${ccsdk.distribution.version}
+FROM onap/ccsdk-odlsli-image:${ccsdk.docker.version}
 
 MAINTAINER SDN-C Team (sdnc@lists.onap.org)
 

diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 2e6c76c..5cd806a 100644 (file)
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -5,22 +5,23 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.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.4.1-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ueb-listener Docker container</description>
 
     <properties>
         <image.name>onap/sdnc-ueb-listener-image</image.name>
-        <sdnc.project.version>${project.version}</sdnc.project.version>
+        <sdnc.project.version>${project.version}</sdnc.project.version>    
+        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-       <docker.push.phase>deploy</docker.push.phase>
+           <docker.push.phase>deploy</docker.push.phase>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 

diff --git a/installation/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile
index 49a70e4..28676fa 100644 (file)
--- a/installation/ueb-listener/src/main/docker/Dockerfile
+++ b/installation/ueb-listener/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version}
+FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version}
 MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties

diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml
index d9c7697..bdd154f 100644 (file)
--- a/platform-logic/datachange/pom.xml
+++ b/platform-logic/datachange/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-datachange</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.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 46c8be8..9bc6194 100644 (file)
--- a/platform-logic/generic-resource-api/pom.xml
+++ b/platform-logic/generic-resource-api/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-generic-resource-api</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index f047de9..636e4aa 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.1.1</version>
+               <version>1.2.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>platform-logic-installer</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.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 0ee7ca9..a751538 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.1.1</version>
+               <version>1.2.0-SNAPSHOT</version>
         <relativePath />
        </parent>
 
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>platform-logic-lcm</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.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 623ff38..7ccdbf7 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.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.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 23c788d..0826343 100644 (file)
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-restapi-templates</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.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 11a79c7..690617b 100644 (file)
--- a/platform-logic/restconfapi-yang/pom.xml
+++ b/platform-logic/restconfapi-yang/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-restconfapi-yang</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.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 c7d1d5c..d3dfefb 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.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>platform-logic-setup</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.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 92c2c8c..c0deed0 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.1.1</version>
+               <version>1.2.0-SNAPSHOT</version>
         <relativePath />
        </parent>
 
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>platform-logic-vnfapi</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>

diff --git a/pom.xml b/pom.xml
index 002b9a7..6431c9b 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.1.1</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>sdnc-oam</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.5.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-oam</name>

diff --git a/version.properties b/version.properties
index 978fd70..37823a3 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,11 +4,11 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 release_name=1
-sprint_number=4
-feature_revision=1
+sprint_number=5
+feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 
-release_version=${base_version}
+release_version=${base_version}-STAGING
 snapshot_version=${base_version}-SNAPSHOT