aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthmsdt <thomas.kulik@telekom.de>2024-01-05 07:06:22 +0100
committerDan Timoney <dtimoney@att.com>2024-01-09 11:49:13 -0500
commita5de3f0ebf2dd06c79ad848c003bc5298534186a (patch)
tree03a991f9834f43990d4849c261919ed62584996b
parent66bf727345053e969208c48d6cc04471a5503cb5 (diff)
fix docs config filesmontreal
Issue-ID: DOC-821 Change-Id: I6edbc7fbc7dcc1762277a346a0cfa89e63699651 Signed-off-by: thmsdt <thomas.kulik@telekom.de>
-rw-r--r--.gitreview2
-rw-r--r--docs/conf.py6
-rw-r--r--docs/tox.ini6
-rw-r--r--ms/neng/pom.xml4
-rw-r--r--ms/sliboot/pom.xml4
-rw-r--r--ms/vlantag-api/pom.xml2
6 files changed, 12 insertions, 12 deletions
diff --git a/.gitreview b/.gitreview
index 7019809e..5516ce98 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
host=gerrit.onap.org
port=29418
project=ccsdk/apps.git
-defaultbranch=master \ No newline at end of file
+defaultbranch=montreal \ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index 70937d74..372eadce 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,6 @@
project = "onap"
-release = "master"
-version = "master"
+release = "montreal"
+version = "montreal"
author = "Open Network Automation Platform"
# yamllint disable-line rule:line-length
@@ -30,7 +30,7 @@ extensions = [
# Change to {releasename} after you have created the new 'doc' branch.
#
-branch = 'latest'
+branch = 'montreal'
intersphinx_mapping = {}
doc_url = 'https://docs.onap.org/projects'
diff --git a/docs/tox.ini b/docs/tox.ini
index b9d7eb44..6426863a 100644
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -8,7 +8,7 @@ basepython = python3.8
deps =
-r{toxinidir}/requirements-docs.txt
-chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=montreal
commands =
sphinx-build -W -q -b html -n -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/html
@@ -17,7 +17,7 @@ basepython = python3.8
deps =
-r{toxinidir}/requirements-docs.txt
-chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=montreal
commands =
sphinx-build -W -q -b linkcheck -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/linkcheck
@@ -26,6 +26,6 @@ basepython = python3.8
deps =
-r{toxinidir}/requirements-docs.txt
-chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt
- -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master
+ -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=montreal
commands =
sphinx-build -W -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck
diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index 36bb45c2..973b6538 100644
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -54,13 +54,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sdk.java.rest>6.2.0.11</sdk.java.rest>
<serviceArtifactName>ms-networkelementnamegen</serviceArtifactName>
- <ccsdk.distribution.version>1.5.0-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.distribution.version>1.5.2</ccsdk.distribution.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<docker.push.phase>deploy</docker.push.phase>
<docker.verbose>true</docker.verbose>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<base.image.name>onap/ccsdk-alpine-j11-image</base.image.name>
- <base.image.version>1.5-STAGING-latest</base.image.version>
+ <base.image.version>1.5.2</base.image.version>
<image.name>onap/ccsdk-apps-ms-neng</image.name>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml
index 30071cb0..385ba5f4 100644
--- a/ms/sliboot/pom.xml
+++ b/ms/sliboot/pom.xml
@@ -18,10 +18,10 @@
<properties>
<start-class>org.onap.ccsdk.apps.ms.sliboot.SlibootApp</start-class>
<base.image.name>onap/ccsdk-alpine-j17-image</base.image.name>
- <base.image.version>1.6-STAGING-latest</base.image.version>
+ <base.image.version>1.5.2</base.image.version>
<image.name>onap/ccsdk-sliboot-alpine-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
- <ccsdk.distribution.version>1.6.0-SNAPSHOT</ccsdk.distribution.version>
+ <ccsdk.distribution.version>1.5.2</ccsdk.distribution.version>
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<ccsdk.sliboot.jar>${project.artifactId}-${project.version}-exec.jar</ccsdk.sliboot.jar>
diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml
index 543b49aa..77775022 100644
--- a/ms/vlantag-api/pom.xml
+++ b/ms/vlantag-api/pom.xml
@@ -33,7 +33,7 @@
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
<base.image.name>onap/ccsdk-alpine-j11-image</base.image.name>
- <base.image.version>1.5-STAGING-latest</base.image.version>
+ <base.image.version>1.5.2</base.image.version>
</properties>
<dependencies>