summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2023-06-06 06:53:08 -0400
committerDan Timoney <dtimoney@att.com>2023-06-06 08:43:54 -0400
commitedbdf2e4910c385c3f50538c2a78e266ae694850 (patch)
treef4984961b08627a8c7ac5216f5fddfdc12258e90
parentff5be98acc5a00a0d730fa18a9658086b63a2331 (diff)
Roll master for Montreal
Roll version to initial snapshot for Montreal release Issue-ID: CCSDK-3903 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I874898373e2dd7e6d4a6b82aa714fb52abad194c
-rw-r--r--alpine/java11/pom.xml2
-rw-r--r--alpine/java17/pom.xml2
-rw-r--r--alpine/pom.xml2
-rw-r--r--ansible-server/pom.xml4
-rwxr-xr-xdependencies/pom.xml2
-rw-r--r--dgbuilder-docker/pom.xml2
-rw-r--r--dgbuilder/pom.xml2
-rw-r--r--docs/sli/apis/sliapi.rst2
-rw-r--r--docs/tox.ini4
-rw-r--r--odlsli/odlsli-alpine/pom.xml2
-rw-r--r--odlsli/pom.xml2
-rw-r--r--opendaylight/chlorine/chlorine-alpine/pom.xml2
-rw-r--r--opendaylight/chlorine/pom.xml2
-rw-r--r--opendaylight/pom.xml2
-rw-r--r--opendaylight/sulfur/pom.xml2
-rw-r--r--opendaylight/sulfur/sulfur-alpine/pom.xml2
-rw-r--r--platform-logic/a1Adapter-api/pom.xml2
-rw-r--r--platform-logic/asdc-api/pom.xml2
-rw-r--r--platform-logic/cMNotify-api/pom.xml2
-rw-r--r--platform-logic/installer/pom.xml2
-rw-r--r--platform-logic/oofpcipoc-api/pom.xml2
-rw-r--r--platform-logic/pom.xml2
-rw-r--r--platform-logic/ran-slice-api/pom.xml2
-rw-r--r--platform-logic/restapi-templates/pom.xml2
-rw-r--r--platform-logic/sliapi/pom.xml2
-rw-r--r--pom.xml2
-rw-r--r--saltstack-server/pom.xml2
-rw-r--r--ubuntu/pom.xml2
-rw-r--r--version.properties4
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-alpine-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-j11-alpine</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-alpine-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-j17-alpine</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-alpine-root</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>ansible-server</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: ${project.artifactId}</name>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>dependencies</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odlsli</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-odlsli-alpine</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-odlsli</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odl-chlorine</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-chlorine-docker</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-opendaylight</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-chlorine</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-opendaylight</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-opendaylight</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-sulfur</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odl-sulfur</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-odl-sulfur-docker</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-a1Adapterapi</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-asdcapi</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-cMNotifyai</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-installer</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-oofpcipocapi</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-platform-logic</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-ranSlice</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-restapi-templates</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-platform-logic</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>platform-logic-sliapi</artifactId>
diff --git a/pom.xml b/pom.xml
index 6a663149..62c40807 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution</name>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>saltstack-server</artifactId>
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 @@
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>distribution-ubuntu</artifactId>
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}