From da9e225fb39b7720c6092d19bb5c8dbe4d002539 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 17 Mar 2020 14:20:42 -0400 Subject: [PATCH] Roll to first Guilin snapshot Roll to first Guilint snapshot version Change-Id: I3137ae6c5407ed723056364674ad827072810cb8 Issue-ID: SDNC-1110 Signed-off-by: Dan Timoney --- .gitignore | 1 + features/features-sdnc-northbound/pom.xml | 4 ++-- features/installer/pom.xml | 4 ++-- features/pom.xml | 4 ++-- features/sdnc-northbound-all/pom.xml | 4 ++-- generic-resource-api/client/pom.xml | 4 ++-- generic-resource-api/features/features-generic-resource-api/pom.xml | 4 ++-- generic-resource-api/features/pom.xml | 4 ++-- generic-resource-api/features/sdnc-generic-resource-api/pom.xml | 4 ++-- generic-resource-api/installer/pom.xml | 4 ++-- generic-resource-api/model/pom.xml | 4 ++-- generic-resource-api/pom.xml | 4 ++-- generic-resource-api/provider/pom.xml | 4 ++-- optical-service/features/features-optical-service/pom.xml | 4 ++-- optical-service/features/pom.xml | 4 ++-- optical-service/features/sdnc-optical-service/pom.xml | 4 ++-- optical-service/installer/pom.xml | 4 ++-- optical-service/model/pom.xml | 4 ++-- optical-service/pom.xml | 4 ++-- optical-service/provider/pom.xml | 4 ++-- pom.xml | 4 ++-- version.properties | 4 ++-- vnfapi/features/features-vnfapi/pom.xml | 4 ++-- vnfapi/features/pom.xml | 4 ++-- vnfapi/features/sdnc-vnfapi/pom.xml | 4 ++-- vnfapi/installer/pom.xml | 4 ++-- vnfapi/model/pom.xml | 4 ++-- vnfapi/pom.xml | 4 ++-- vnfapi/provider/pom.xml | 4 ++-- vnftools/features/features-vnftools/pom.xml | 4 ++-- vnftools/features/pom.xml | 4 ++-- vnftools/features/sdnc-vnftools/pom.xml | 4 ++-- vnftools/installer/pom.xml | 4 ++-- vnftools/pom.xml | 4 ++-- vnftools/provider/pom.xml | 4 ++-- 35 files changed, 69 insertions(+), 68 deletions(-) diff --git a/.gitignore b/.gitignore index 8b49fb2a..8eaad449 100755 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ out/ .metadata provider/src/main/java/META-INF/ provider/src/main/java/inventory/ +yang-gen-sal/ ## BlackDuck generated file sdnc-northbound_bdio.jsonld diff --git a/features/features-sdnc-northbound/pom.xml b/features/features-sdnc-northbound/pom.xml index 0ec1043f..fc4e70b3 100644 --- a/features/features-sdnc-northbound/pom.xml +++ b/features/features-sdnc-northbound/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound features-sdnc-northbound - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT feature sdnc-northbound :: features :: ${project.artifactId} diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 3eb58812..ffffc539 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound sdnc-northbound-features-installer - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: features :: ${project.artifactId} diff --git a/features/pom.xml b/features/pom.xml index b2c3c385..50e0389c 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound sdnc-northbound-feature-aggregator - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: features diff --git a/features/sdnc-northbound-all/pom.xml b/features/sdnc-northbound-all/pom.xml index e73345f2..31e7cab5 100644 --- a/features/sdnc-northbound-all/pom.xml +++ b/features/sdnc-northbound-all/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound sdnc-northbound-all - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT feature sdnc-northbound :: features :: ${project.artifactId} diff --git a/generic-resource-api/client/pom.xml b/generic-resource-api/client/pom.xml index b2f2bf75..60e21f39 100644 --- a/generic-resource-api/client/pom.xml +++ b/generic-resource-api/client/pom.xml @@ -6,7 +6,7 @@ jar org.onap.sdnc.northbound generic-resource-api-client - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT sdnc-northbound :: generic-resource-api:: ${project.artifactId} http://wiki.onap.org @@ -15,7 +15,7 @@ org.onap.ccsdk.parent client-parent - 1.5.2 + 2.0.0-SNAPSHOT diff --git a/generic-resource-api/features/features-generic-resource-api/pom.xml b/generic-resource-api/features/features-generic-resource-api/pom.xml index 8f487bff..2e089560 100644 --- a/generic-resource-api/features/features-generic-resource-api/pom.xml +++ b/generic-resource-api/features/features-generic-resource-api/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound features-generic-resource-api - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT feature sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml index 19b84495..91fdbf13 100644 --- a/generic-resource-api/features/pom.xml +++ b/generic-resource-api/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound generic-resource-api-features - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml index 84e339a7..8a698f12 100644 --- a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml +++ b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound sdnc-generic-resource-api - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT feature sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml index ac1fa6cd..f20b0970 100755 --- a/generic-resource-api/installer/pom.xml +++ b/generic-resource-api/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound generic-resource-api-installer - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml index 87bd2b82..16b88c6f 100644 --- a/generic-resource-api/model/pom.xml +++ b/generic-resource-api/model/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound generic-resource-api-model - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT bundle sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml index e441923f..561716f5 100644 --- a/generic-resource-api/pom.xml +++ b/generic-resource-api/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound generic-resource-api - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: generic-resource-api diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml index 93195ad1..d6679bdd 100644 --- a/generic-resource-api/provider/pom.xml +++ b/generic-resource-api/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound generic-resource-api-provider - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT bundle sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/optical-service/features/features-optical-service/pom.xml b/optical-service/features/features-optical-service/pom.xml index daff1858..dcfef2be 100644 --- a/optical-service/features/features-optical-service/pom.xml +++ b/optical-service/features/features-optical-service/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound features-optical-service - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT feature sdnc-northbound :: optical-service :: ${project.artifactId} diff --git a/optical-service/features/pom.xml b/optical-service/features/pom.xml index bf9aa6f2..3c163d11 100644 --- a/optical-service/features/pom.xml +++ b/optical-service/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound optical-service-features - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: optical-service:: ${project.artifactId} diff --git a/optical-service/features/sdnc-optical-service/pom.xml b/optical-service/features/sdnc-optical-service/pom.xml index 7f66fd83..6b41d2ba 100644 --- a/optical-service/features/sdnc-optical-service/pom.xml +++ b/optical-service/features/sdnc-optical-service/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound sdnc-optical-service - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT feature sdnc-northbound :: optical-service :: ${project.artifactId} diff --git a/optical-service/installer/pom.xml b/optical-service/installer/pom.xml index 32fe2120..a790bf4f 100644 --- a/optical-service/installer/pom.xml +++ b/optical-service/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound optical-service-installer - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: optical-service :: ${project.artifactId} diff --git a/optical-service/model/pom.xml b/optical-service/model/pom.xml index da9e0656..32b684e2 100644 --- a/optical-service/model/pom.xml +++ b/optical-service/model/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound optical-service-model - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT bundle sdnc-northbound :: optical-service :: ${project.artifactId} diff --git a/optical-service/pom.xml b/optical-service/pom.xml index 151327ba..d75cf7db 100644 --- a/optical-service/pom.xml +++ b/optical-service/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound optical-service - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: optical-service diff --git a/optical-service/provider/pom.xml b/optical-service/provider/pom.xml index 7ea7ab63..9674e2d0 100644 --- a/optical-service/provider/pom.xml +++ b/optical-service/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound optical-service-provider - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT bundle sdnc-northbound :: optical-service :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index 2f5a9c17..fd9fd173 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound sdnc-northbound - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound diff --git a/version.properties b/version.properties index c8c0485d..5d7fc98f 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} diff --git a/vnfapi/features/features-vnfapi/pom.xml b/vnfapi/features/features-vnfapi/pom.xml index 042a4406..7bbe0da3 100644 --- a/vnfapi/features/features-vnfapi/pom.xml +++ b/vnfapi/features/features-vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound features-vnfapi - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT feature sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/features/pom.xml b/vnfapi/features/pom.xml index 3ac882cb..08ae16f1 100644 --- a/vnfapi/features/pom.xml +++ b/vnfapi/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound vnfapi-features - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/features/sdnc-vnfapi/pom.xml b/vnfapi/features/sdnc-vnfapi/pom.xml index 4bab18de..b6054c6a 100644 --- a/vnfapi/features/sdnc-vnfapi/pom.xml +++ b/vnfapi/features/sdnc-vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound sdnc-vnfapi - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT feature sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml index ad0deb9d..4ee02f85 100755 --- a/vnfapi/installer/pom.xml +++ b/vnfapi/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound vnfapi-installer - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/model/pom.xml b/vnfapi/model/pom.xml index 81399ce2..162a5033 100644 --- a/vnfapi/model/pom.xml +++ b/vnfapi/model/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound vnfapi-model - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT bundle sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/pom.xml b/vnfapi/pom.xml index 48c84833..688405b1 100644 --- a/vnfapi/pom.xml +++ b/vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound vnfapi - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: vnfapi diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml index 50d1f946..02b569e0 100644 --- a/vnfapi/provider/pom.xml +++ b/vnfapi/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound vnfapi-provider - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT bundle sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnftools/features/features-vnftools/pom.xml b/vnftools/features/features-vnftools/pom.xml index 5c296d01..8c74d891 100644 --- a/vnftools/features/features-vnftools/pom.xml +++ b/vnftools/features/features-vnftools/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound features-vnftools - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT feature sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/features/pom.xml b/vnftools/features/pom.xml index ac6e066d..b02402bb 100644 --- a/vnftools/features/pom.xml +++ b/vnftools/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound vnftools-features - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/features/sdnc-vnftools/pom.xml b/vnftools/features/sdnc-vnftools/pom.xml index f8108ede..1e34bf60 100644 --- a/vnftools/features/sdnc-vnftools/pom.xml +++ b/vnftools/features/sdnc-vnftools/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound sdnc-vnftools - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT feature sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml index 6c474457..e39b93da 100755 --- a/vnftools/installer/pom.xml +++ b/vnftools/installer/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound vnftools-installer - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/pom.xml b/vnftools/pom.xml index 2835a4c3..50500410 100644 --- a/vnftools/pom.xml +++ b/vnftools/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound vnftools - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom VNF Tools Plugin diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml index c1d4c3d2..46aa8a90 100644 --- a/vnftools/provider/pom.xml +++ b/vnftools/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.northbound vnftools-provider - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT bundle sdnc-northbound :: vnftools :: ${project.artifactId} -- 2.16.6