diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-05-02 16:24:22 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-05-03 10:31:19 -0400 |
| commit | 0634f80b3ded144b031ef570434848e7414e12ad (patch) | |
| tree | 761f37b9c6aab5f1444948a72387600823ad9368 | |
| parent | ec9b39ef824eb90f8306b1d7686b92e6f5a08669 (diff) | |
Roll to El Alto version
Roll to El Alto version (1.6.0-SNAPSHOT) on master branch
Change-Id: I5809a3ba7bd629d16fb679235d0e8a9173fb993a
Issue-ID: SDNC-735
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Former-commit-id: 8e41096b20a56f91be8df5f5ff200f76e9d7d4c3
26 files changed, 56 insertions, 56 deletions
diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml index a05a6a0e..98a603f4 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.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 bf372d81..2d318eb7 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.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 32915286..27effb16 100644 --- 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</version> + <version>1.3.0-SNAPSHOT</version> </parent> <distributionManagement> <repository> diff --git a/admportal/pom.xml b/admportal/pom.xml index 6179e32e..29f9ce95 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.2.2</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 6c018eb0..a0e3539f 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.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 d9757e31..a8f6b1b8 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.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</version> + <version>1.3.0-SNAPSHOT</version> </parent> <properties> diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml index bd8792db..ecadf44f 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.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 232ba161..39ed4bba 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.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 b7871841..48d09fef 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.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 1e389c0a..8c7214e6 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.2.2</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 8894205e..0fbfd4a9 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.2.2</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 0be700d0..54771e99 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.2.2</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 306dcd60..01f8aa53 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.2.2</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 cecc5904..fdff6698 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.2.2</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</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 bf4519da..e068909b 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.2.2</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 f46016e0..ae4419f3 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.2.2</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 0ae99afb..a7bf825a 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.2.2</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/installer/pom.xml b/platform-logic/installer/pom.xml index 5b0a90b4..de6500df 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.2.2</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 5296a8b7..923daf76 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.2.2</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 32829fdb..6ee01b36 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.2.2</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 d5bfed2d..37948603 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.2.2</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 f59bcfb5..16f92af2 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.2.2</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 9bdb662a..c9d9c5f1 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.2.2</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 0bac395a..8b0c667e 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.2.2</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> @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.2.2</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 423a3297..c5201d26 100644 --- 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} |