Merge "Roll to Guilin release snapshot"
Former-commit-id: 2569ded48e1d9f42b0b235cd19bbc44b4f602119
diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml
index 669e5fe..b0e7c04 100644
--- 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.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>sdnc-oam :: SdncReports :: SdncReportsApi</name>
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>SdncReports</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml
index 19659d0..5c95994 100644
--- 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.8.0-SNAPSHOT</version>
+ <version>2.0.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.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml
index 136bde9..56a7391 100644
--- a/SdncReports/pom.xml
+++ b/SdncReports/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>SdncReports</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<distributionManagement>
<repository>
diff --git a/admportal/pom.xml b/admportal/pom.xml
index 3df4231..3589239 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>admportal</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: admportal</name>
diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml
index ab5b08a..b1e35c0 100644
--- 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.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>getBackupVnfDetailService</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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 0ca56d6..07916c0 100644
--- a/configbackuprestore/pom.xml
+++ b/configbackuprestore/pom.xml
@@ -5,14 +5,14 @@
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml
index 7d11c05..70a9a80 100644
--- 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.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>vnfconfigbackupservice</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>vnfconfigreportsservice</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml
index a4cebc5..4cd0356 100644
--- 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.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>vnfconfigreportsservice</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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 9c068f6..f9470a0 100644
--- a/data-migrator/pom.xml
+++ b/data-migrator/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>sdnc-oam</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>data-migrator</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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 db2cddc..9d72dd8 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-admportal</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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 e17e5c1..93ad519 100644
--- 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.5.2</version>
+ <version>2.0.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.8.0-SNAPSHOT</version>
+ <version>2.0.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 9363b40..e25f6f1 100644
--- 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.5.2</version>
+ <version>2.0.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.8.0-SNAPSHOT</version>
+ <version>2.0.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 cdc8dd6..3d814ed 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>sdnc-oam :: installation</name>
<description>Installs SDN-C on local file system</description>
diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index 037c4e9..3e81dc0 100644
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-sdnc-web</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 63d3a21..1f4ecd5 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-sdnc</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates SDN Controller Docker container</description>
diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index dea6bb4..f6044ec 100644
--- 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.5.2</version>
+ <version>2.0.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.8.0-SNAPSHOT</version>
+ <version>2.0.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 12c66a5..b37b9d9 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-datachange</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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 b856cd5..2fb2528 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-generic-resource-api</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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 727816e..8af947b 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-installer</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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 e8b0d71..c4cdc33 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-lcm</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml
index 1025b3a..47803bc 100644
--- a/platform-logic/optical-service/pom.xml
+++ b/platform-logic/optical-service/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-optical-service</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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 48454b5..477c6ac 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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 8120540..41c64ef 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-restapi-templates</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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 a31ea26..cc3a931 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-restconfapi-yang</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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 9757605..3fd2e9b 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-setup</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.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 66d2773..3272c88 100644
--- 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.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-vnfapi</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/pom.xml b/pom.xml
index a19486c..41672ec 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.5.2</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>sdnc-oam</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam</name>
diff --git a/version.properties b/version.properties
index 9a2a5d8..99af217 100644
--- a/version.properties
+++ b/version.properties
@@ -3,8 +3,8 @@
# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
# because they are used in Jenkins, whose plug-in doesn't support
-release_name=1
-sprint_number=8
+release_name=2
+sprint_number=0
feature_revision=0
base_version=${release_name}.${sprint_number}.${feature_revision}