From edbdf2e4910c385c3f50538c2a78e266ae694850 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 6 Jun 2023 06:53:08 -0400 Subject: [PATCH] Roll master for Montreal Roll version to initial snapshot for Montreal release Issue-ID: CCSDK-3903 Signed-off-by: Dan Timoney Change-Id: I874898373e2dd7e6d4a6b82aa714fb52abad194c --- alpine/java11/pom.xml | 2 +- alpine/java17/pom.xml | 2 +- alpine/pom.xml | 2 +- ansible-server/pom.xml | 4 ++-- dependencies/pom.xml | 2 +- dgbuilder-docker/pom.xml | 2 +- dgbuilder/pom.xml | 2 +- docs/sli/apis/sliapi.rst | 2 +- docs/tox.ini | 4 ++-- odlsli/odlsli-alpine/pom.xml | 2 +- odlsli/pom.xml | 2 +- opendaylight/chlorine/chlorine-alpine/pom.xml | 2 +- opendaylight/chlorine/pom.xml | 2 +- opendaylight/pom.xml | 2 +- opendaylight/sulfur/pom.xml | 2 +- opendaylight/sulfur/sulfur-alpine/pom.xml | 2 +- platform-logic/a1Adapter-api/pom.xml | 2 +- platform-logic/asdc-api/pom.xml | 2 +- platform-logic/cMNotify-api/pom.xml | 2 +- platform-logic/installer/pom.xml | 2 +- platform-logic/oofpcipoc-api/pom.xml | 2 +- platform-logic/pom.xml | 2 +- platform-logic/ran-slice-api/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- platform-logic/sliapi/pom.xml | 2 +- pom.xml | 2 +- saltstack-server/pom.xml | 2 +- ubuntu/pom.xml | 2 +- version.properties | 4 ++-- 29 files changed, 32 insertions(+), 32 deletions(-) diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml index 0b197ce9..0c0c0b73 100644 --- a/alpine/java11/pom.xml +++ b/alpine/java11/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-alpine-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-j11-alpine diff --git a/alpine/java17/pom.xml b/alpine/java17/pom.xml index b497f3c1..5c590f6b 100644 --- a/alpine/java17/pom.xml +++ b/alpine/java17/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-alpine-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-j17-alpine diff --git a/alpine/pom.xml b/alpine/pom.xml index 29031c2c..9f413a5a 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-alpine-root diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index 67afe1d7..15faf5ae 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT org.onap.ccsdk.distribution ansible-server - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT pom ccsdk-distribution :: ${project.artifactId} diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 4cc888a1..4d989c7f 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT dependencies diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 968d004d..5f1db7b1 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT org.onap.ccsdk.distribution diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index 8648f20f..b7679d3a 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT org.onap.ccsdk.distribution diff --git a/docs/sli/apis/sliapi.rst b/docs/sli/apis/sliapi.rst index 13cdcbd5..5090b8e4 100644 --- a/docs/sli/apis/sliapi.rst +++ b/docs/sli/apis/sliapi.rst @@ -10,6 +10,6 @@ SLI-API(2016-11-11) -.. swaggerv2doc:: https://gerrit.onap.org/r/gitweb?p=ccsdk/sli/core.git;a=blob_plain;f=sliapi/model/src/main/resources/sli-api.20161110.json +.. swaggerv2doc:: https://gerrit.onap.org/r/gitweb?p=ccsdk/sli.git;a=blob_plain;f=core/sliapi/model/swagger/src/main/json/sliapi.json;hb=refs/heads/master diff --git a/docs/tox.ini b/docs/tox.ini index 61b6ccfa..379d8e42 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -12,7 +12,7 @@ deps = commands = sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html echo "Generated docs available in {toxinidir}/_build/html" -whitelist_externals = +allowlist_externals = echo git sh @@ -25,7 +25,7 @@ deps = -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master commands = echo "Link Checking not enforced" #commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck -whitelist_externals = echo +allowlist_externals = echo [testenv:docs-spellcheck] basepython = python3.8 diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index d0b7862f..30c7a906 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odlsli - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-odlsli-alpine diff --git a/odlsli/pom.xml b/odlsli/pom.xml index dbbe6fb1..f367103b 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-odlsli diff --git a/opendaylight/chlorine/chlorine-alpine/pom.xml b/opendaylight/chlorine/chlorine-alpine/pom.xml index 4ba806db..0762ffe6 100644 --- a/opendaylight/chlorine/chlorine-alpine/pom.xml +++ b/opendaylight/chlorine/chlorine-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odl-chlorine - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-odl-chlorine-docker diff --git a/opendaylight/chlorine/pom.xml b/opendaylight/chlorine/pom.xml index 47a185e2..c419929b 100644 --- a/opendaylight/chlorine/pom.xml +++ b/opendaylight/chlorine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-opendaylight - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-odl-chlorine diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 3eb28e76..931664a6 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-opendaylight diff --git a/opendaylight/sulfur/pom.xml b/opendaylight/sulfur/pom.xml index 52827111..e1c7071e 100644 --- a/opendaylight/sulfur/pom.xml +++ b/opendaylight/sulfur/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-opendaylight - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-odl-sulfur diff --git a/opendaylight/sulfur/sulfur-alpine/pom.xml b/opendaylight/sulfur/sulfur-alpine/pom.xml index 1065e0b2..43821870 100644 --- a/opendaylight/sulfur/sulfur-alpine/pom.xml +++ b/opendaylight/sulfur/sulfur-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odl-sulfur - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-odl-sulfur-docker diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml index d3caa0d6..6cabf9ff 100644 --- a/platform-logic/a1Adapter-api/pom.xml +++ b/platform-logic/a1Adapter-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-a1Adapterapi diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index 4e7ec196..63a13ac1 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-asdcapi diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml index fc286e77..551c00d1 100644 --- a/platform-logic/cMNotify-api/pom.xml +++ b/platform-logic/cMNotify-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-cMNotifyai diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 8886d5c3..83f944e4 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-installer diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml index ce0be167..ef02a736 100644 --- a/platform-logic/oofpcipoc-api/pom.xml +++ b/platform-logic/oofpcipoc-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-oofpcipocapi diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 3bebdb6b..738a97db 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-platform-logic diff --git a/platform-logic/ran-slice-api/pom.xml b/platform-logic/ran-slice-api/pom.xml index 2e6a986d..b55a1cef 100644 --- a/platform-logic/ran-slice-api/pom.xml +++ b/platform-logic/ran-slice-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-ranSlice diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 672ce310..8cff9818 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index 58ec2921..09cdd000 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT platform-logic-sliapi diff --git a/pom.xml b/pom.xml index 6a663149..62c40807 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT pom ccsdk-distribution diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml index bc26dfd0..f79b205f 100644 --- a/saltstack-server/pom.xml +++ b/saltstack-server/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT saltstack-server diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index c513c0c8..b9ef1e44 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.5.2-SNAPSHOT + 1.6.0-SNAPSHOT distribution-ubuntu diff --git a/version.properties b/version.properties index 99005bfb..576a5c90 100644 --- a/version.properties +++ b/version.properties @@ -5,8 +5,8 @@ release_name=1 -sprint_number=5 -feature_revision=2 +sprint_number=6 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6