From c261e3f719abcbea0762162dc9244f951296c6a1 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 23 Oct 2018 16:23:03 -0400 Subject: [PATCH] Roll to initial Dublin snapshot Roll to initial Dublin snapshot Change-Id: Id36b1e41ae75a7c282a5db85b30abe3a7688aeb9 Issue-ID: SDNC-480 Signed-off-by: Timoney, Dan (dt5972) 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) --- SdncReports/SdncReportsApi/pom.xml | 4 ++-- SdncReports/SdncReportsDao/pom.xml | 4 ++-- SdncReports/pom.xml | 4 ++-- admportal/pom.xml | 4 ++-- configbackuprestore/getBackupVnfDetailService/pom.xml | 4 ++-- configbackuprestore/pom.xml | 4 ++-- configbackuprestore/vnfconfigbackupservice/pom.xml | 8 ++++---- configbackuprestore/vnfconfigreportsservice/pom.xml | 4 ++-- dgbuilder/pom.xml | 4 ++-- installation/admportal/pom.xml | 5 +++-- installation/admportal/src/main/docker/Dockerfile | 2 +- installation/ansible-server/pom.xml | 5 +++-- installation/ansible-server/src/main/docker/Dockerfile | 2 +- installation/dgbuilder/pom.xml | 2 +- installation/dmaap-listener/pom.xml | 5 +++-- installation/dmaap-listener/src/main/docker/Dockerfile | 2 +- installation/pom.xml | 4 ++-- installation/sdnc/pom.xml | 5 +++-- installation/sdnc/src/main/docker/Dockerfile | 2 +- installation/ueb-listener/pom.xml | 9 +++++---- installation/ueb-listener/src/main/docker/Dockerfile | 2 +- platform-logic/datachange/pom.xml | 4 ++-- platform-logic/generic-resource-api/pom.xml | 4 ++-- platform-logic/installer/pom.xml | 4 ++-- platform-logic/lcm/pom.xml | 4 ++-- platform-logic/pom.xml | 4 ++-- platform-logic/restapi-templates/pom.xml | 4 ++-- platform-logic/restconfapi-yang/pom.xml | 4 ++-- platform-logic/setup/pom.xml | 4 ++-- platform-logic/vnfapi/pom.xml | 4 ++-- pom.xml | 4 ++-- version.properties | 6 +++--- 32 files changed, 68 insertions(+), 63 deletions(-) diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml index b6cb9483..8d3caabb 100644 --- a/SdncReports/SdncReportsApi/pom.xml +++ b/SdncReports/SdncReportsApi/pom.xml @@ -5,12 +5,12 @@ jar SdncReportsApi org.onap.sdnc.oam - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: SdncReports :: SdncReportsApi org.onap.sdnc.oam SdncReports - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml index 2278f600..3a93e39b 100644 --- a/SdncReports/SdncReportsDao/pom.xml +++ b/SdncReports/SdncReportsDao/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.onap.sdnc.oam SdncReportsDao - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT jar sdnc-oam :: SdncReports :: SdncReportsDao @@ -12,7 +12,7 @@ org.onap.sdnc.oam SdncReports - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index fd74e763..026f9616 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -6,7 +6,7 @@ org.onap.sdnc.oam SdncReports - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: SdncReports @@ -14,7 +14,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.1.1 + 1.2.0-SNAPSHOT diff --git a/admportal/pom.xml b/admportal/pom.xml index 1bdc96d8..6c390aac 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -6,13 +6,13 @@ org.onap.ccsdk.parent binding-parent - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam admportal - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: admportal diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml index 04055b90..1f00a108 100644 --- a/configbackuprestore/getBackupVnfDetailService/pom.xml +++ b/configbackuprestore/getBackupVnfDetailService/pom.xml @@ -7,11 +7,11 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup getBackupVnfDetailService - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: vnfbackup :: getBackupVnfDetailService http://maven.apache.org diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 9608a21a..035c616e 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -7,14 +7,14 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: vnfbackup pom org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.1.1 + 1.2.0-SNAPSHOT diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml index e96b5a0a..606062ea 100644 --- a/configbackuprestore/vnfconfigbackupservice/pom.xml +++ b/configbackuprestore/vnfconfigbackupservice/pom.xml @@ -8,12 +8,12 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigbackupservice - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: vnfbackup :: vnfconfigbackupservice http://maven.apache.org @@ -22,13 +22,13 @@ org.onap.sdnc.oam.vnfbackup getBackupVnfDetailService - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigreportsservice - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml index 8182b8a4..b84886fd 100644 --- a/configbackuprestore/vnfconfigreportsservice/pom.xml +++ b/configbackuprestore/vnfconfigreportsservice/pom.xml @@ -7,11 +7,11 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigreportsservice - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: vnfbackup :: vnfconfigreportservice http://maven.apache.org diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index 74eb7319..99289e8b 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam dgbuilder - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: dgbuilder diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 5a8e3c68..7cd1f478 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -5,14 +5,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-admportal - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates admportal Docker container @@ -20,6 +20,7 @@ onap/admportal-sdnc-image ${project.version} + 0.4-STAGING-latest yyyyMMdd'T'HHmmss'Z' diff --git a/installation/admportal/src/main/docker/Dockerfile b/installation/admportal/src/main/docker/Dockerfile index fadb8120..abaa056f 100644 --- 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 b9e88cbe..0ec328ee 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-ansible-server - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates ansible-server Docker container @@ -19,6 +19,7 @@ onap/sdnc-ansible-server-image ${project.version} + 0.4-STAGING-latest ${https_proxy} yyyyMMdd'T'HHmmss'Z' diff --git a/installation/ansible-server/src/main/docker/Dockerfile b/installation/ansible-server/src/main/docker/Dockerfile index ea9e61b7..0e59fba8 100644 --- 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 c9e9d79e..6ddd1eb8 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 09f6048e..7878df52 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-dmaap-listener - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates dmaap-listener Docker container @@ -19,6 +19,7 @@ onap/sdnc-dmaap-listener-image ${project.version} + 0.4-STAGING-latest ${https_proxy} yyyyMMdd'T'HHmmss'Z' diff --git a/installation/dmaap-listener/src/main/docker/Dockerfile b/installation/dmaap-listener/src/main/docker/Dockerfile index 49a70e4f..28676fac 100644 --- 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 65ead6f2..383c6763 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,14 +5,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: installation Installs SDN-C on local file system diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 82a98195..4202e538 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,14 +5,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-sdnc - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container @@ -21,6 +21,7 @@ onap/sdnc-image ${project.version} 1.4.1 + 0.4-STAGING-latest ${https_proxy} deploy true diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 13a644e4..89e2aa01 100755 --- 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 2e6c76c0..5cd806a4 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,22 +5,23 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-ueb-listener - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates ueb-listener Docker container onap/sdnc-ueb-listener-image - ${project.version} + ${project.version} + 0.4-STAGING-latest ${https_proxy} - deploy + deploy yyyyMMdd'T'HHmmss'Z' diff --git a/installation/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile index 49a70e4f..28676fac 100644 --- 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 d9c76978..bdd154f1 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -6,13 +6,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-datachange - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index 46c8be86..9bc61948 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -6,13 +6,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-generic-resource-api - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index f047de95..636e4aa7 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-installer - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index 0ee7ca96..a7515381 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-lcm - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 623ff38d..7ccdbf74 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 23c788d1..08263434 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -6,13 +6,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-restapi-templates - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index 11a79c77..690617b9 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -6,13 +6,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-restconfapi-yang - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index c7d1d5cd..d3dfefb3 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-setup - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 92c2c8c8..c0deed0e 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-vnfapi - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index 002b9a7d..6431c9b4 100755 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam sdnc-oam - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam diff --git a/version.properties b/version.properties index 978fd70d..37823a3d 100644 --- 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 -- 2.16.6