From: Timoney, Dan (dt5972) Date: Tue, 20 Aug 2019 19:40:38 +0000 (-0400) Subject: Port to Neon X-Git-Tag: 1.7.3~12 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=b2eb9ed53fabb824f8de08f4c3b8be27e404aeb8 Port to Neon Port sdnc/oam to Neon version of CCSDK and SDNC artifacts Change-Id: I4a195d0c5e993c433c0c03a898d60521c7df2a9f Issue-ID: SDNC-850 Signed-off-by: Timoney, Dan (dt5972) Former-commit-id: 18aff1a38583891cbcddca7242e2326b80d88a8d --- diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml index a429784f..a4449bcd 100644 --- a/SdncReports/SdncReportsApi/pom.xml +++ b/SdncReports/SdncReportsApi/pom.xml @@ -4,12 +4,12 @@ jar SdncReportsApi org.onap.sdnc.oam - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT sdnc-oam :: SdncReports :: SdncReportsApi org.onap.sdnc.oam SdncReports - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml index 83c6873e..7540d75e 100644 --- a/SdncReports/SdncReportsDao/pom.xml +++ b/SdncReports/SdncReportsDao/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.onap.sdnc.oam SdncReportsDao - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT jar sdnc-oam :: SdncReports :: SdncReportsDao @@ -11,7 +11,7 @@ org.onap.sdnc.oam SdncReports - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index e72fe132..a816c99c 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam SdncReports - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-oam :: SdncReports @@ -13,7 +13,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.3.2 + 1.4.0-SNAPSHOT diff --git a/admportal/pom.xml b/admportal/pom.xml index 81ef8556..c08264e0 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.2 + 1.4.0-SNAPSHOT org.onap.sdnc.oam admportal - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-oam :: admportal @@ -54,11 +54,6 @@ antlr4 ${antlr.version} - - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} - diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml index a231a87c..5843baa7 100644 --- a/configbackuprestore/getBackupVnfDetailService/pom.xml +++ b/configbackuprestore/getBackupVnfDetailService/pom.xml @@ -4,11 +4,11 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup getBackupVnfDetailService - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT sdnc-oam :: vnfbackup :: getBackupVnfDetailService http://maven.apache.org diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 8507e14d..3be3c14f 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,14 +5,14 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT sdnc-oam :: vnfbackup pom org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.3.2 + 1.4.0-SNAPSHOT diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml index 318972db..b148745e 100644 --- a/configbackuprestore/vnfconfigbackupservice/pom.xml +++ b/configbackuprestore/vnfconfigbackupservice/pom.xml @@ -6,12 +6,12 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigbackupservice - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT sdnc-oam :: vnfbackup :: vnfconfigbackupservice http://maven.apache.org @@ -20,13 +20,13 @@ org.onap.sdnc.oam.vnfbackup getBackupVnfDetailService - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigreportsservice - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml index 185bb407..fda40fa3 100644 --- a/configbackuprestore/vnfconfigreportsservice/pom.xml +++ b/configbackuprestore/vnfconfigreportsservice/pom.xml @@ -4,11 +4,11 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigreportsservice - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT sdnc-oam :: vnfbackup :: vnfconfigreportservice http://maven.apache.org diff --git a/data-migrator/pom.xml b/data-migrator/pom.xml index b5f4257d..d4b7d9b3 100644 --- a/data-migrator/pom.xml +++ b/data-migrator/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam sdnc-oam - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT org.onap.sdnc.oam data-migrator - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT jar sdnc-oam :: data-migrator diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 1d48c3b7..8475b1c7 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-admportal - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates admportal Docker container @@ -20,7 +20,7 @@ onap/admportal-sdnc-image ${project.version} ${maven.build.timestamp} - 0.4-STAGING-latest + 0.6-STAGING-latest yyyyMMdd'T'HHmmss'Z' @@ -46,7 +46,7 @@ io.fabric8 docker-maven-plugin - 0.16.5 + 0.28.0 false @@ -56,7 +56,7 @@ try ${basedir}/target/docker-stage - ${basedir}/target/docker-stage/Dockerfile + Dockerfile ${project.docker.latestminortag.version} ${project.docker.latestfulltag.version} diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 8e38a4c8..da2c4453 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-ansible-server - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates ansible-server Docker container @@ -19,7 +19,7 @@ onap/sdnc-ansible-server-image ${project.version} ${maven.build.timestamp} - 0.4-STAGING-latest + 0.6-STAGING-latest ${https_proxy} yyyyMMdd'T'HHmmss'Z' @@ -79,7 +79,7 @@ io.fabric8 docker-maven-plugin - 0.16.5 + 0.28.0 false @@ -88,7 +88,7 @@ try ${basedir}/target/docker-stage - ${basedir}/target/docker-stage/Dockerfile + Dockerfile ${project.docker.latestminortag.version} ${project.docker.latestfulltag.version} diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 62ed8386..2c8bfa8c 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-dmaap-listener - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates dmaap-listener Docker container @@ -19,7 +19,7 @@ onap/sdnc-dmaap-listener-image ${project.version} ${maven.build.timestamp} - 0.4-STAGING-latest + 0.6-STAGING-latest ${https_proxy} yyyyMMdd'T'HHmmss'Z' diff --git a/installation/pom.xml b/installation/pom.xml index 0c83e328..cdf3f479 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation - 1.6.2-SNAPSHOT + 1.7.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 e3877a2a..80a2054a 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-sdnc - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container @@ -21,9 +21,9 @@ onap/sdnc-image ${project.version} ${maven.build.timestamp} - 1.6.1 - 0.5.1 - 0.5.1 + 1.7.0-SNAPSHOT + 0.6-STAGING-latest + 0.6.0-SNAPSHOT org.onap.sdnc.p12 8443 diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 18d3597f..a2b07b18 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-ueb-listener - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates ueb-listener Docker container @@ -19,7 +19,7 @@ onap/sdnc-ueb-listener-image ${project.version} ${maven.build.timestamp} - 0.4-STAGING-latest + 0.6-STAGING-latest ${https_proxy} deploy yyyyMMdd'T'HHmmss'Z' diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index bb5f90cd..3ffee30c 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT org.onap.sdnc.oam platform-logic-datachange - 1.6.2-SNAPSHOT + 1.7.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 e7270769..a35a4d14 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT org.onap.sdnc.oam platform-logic-generic-resource-api - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 73eaae82..2e6609d0 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT org.onap.sdnc.oam platform-logic-installer - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index a6139493..6170db9d 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT org.onap.sdnc.oam platform-logic-lcm - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 236136c7..9ac28ee4 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT org.onap.sdnc.oam platform-logic - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-oam :: platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index cd147d06..9684ea8b 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT org.onap.sdnc.oam platform-logic-restapi-templates - 1.6.2-SNAPSHOT + 1.7.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 9e30d5eb..03867848 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT org.onap.sdnc.oam platform-logic-restconfapi-yang - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index 5fd466f9..9b3cf7eb 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT org.onap.sdnc.oam platform-logic-setup - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 6ebbc000..6c7a2a27 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT org.onap.sdnc.oam platform-logic-vnfapi - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index 3734ce4c..4e2ca895 100755 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.4.0-SNAPSHOT org.onap.sdnc.oam sdnc-oam - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-oam diff --git a/version.properties b/version.properties index 92658964..5ef8acd8 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=6 -feature_revision=2 +sprint_number=7 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision}