Finalise documentation for Jakarta

 Specified version of antrl4-maven-plugin
 Repo changed to jakarta
 All reference to OOM repo still points to master as Jakarta branching is not yet done for OOM.

Issue-ID: CPS-976
Signed-off-by: puthuparambil.aditya <aditya.puthuparambil@bell.ca>
Change-Id: Iaa22f169e11547c5ef45dee791f6cee590f1c2bc

diff --git a/docs/architecture.rst b/docs/architecture.rst
index 26a8c63..d5ad9be 100644 (file)
--- a/docs/architecture.rst
+++ b/docs/architecture.rst
@@ -21,8 +21,6 @@ In this release CPS is no longer a stand alone component and is released along w
 Project page describing eventual scope and ambition is here:
 `Configuration Persistence Service Project <https://wiki.onap.org/display/DW/Configuration+Persistence+Service+Project>`_
 
-This page reflects the state for Istanbul-R9 release.
-
 .. image:: _static/star.png
     :class: float-left
 

diff --git a/docs/conf.py b/docs/conf.py
index 84dac1e..6c1f8f7 100755 (executable)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,7 +21,7 @@ from docutils.parsers.rst import directives
 from docs_conf.conf import *
 
 #change 'latest' to relevant branch-name once branch has been created
-branch = 'latest'
+branch = 'jakarta'
 doc_url = 'https://docs.onap.org/projects'
 master_doc = 'index'
 

diff --git a/docs/conf.yaml b/docs/conf.yaml
index 8425e08..70727b7 100644 (file)
--- a/docs/conf.yaml
+++ b/docs/conf.yaml
@@ -21,5 +21,5 @@ project_cfg: onap
 project: onap
 
 # Change this to ReleaseBranchName to modify the header
-default-version: latest
+default-version: jakarta
 #

diff --git a/docs/deployment.rst b/docs/deployment.rst
index 3f5943c..f07113d 100644 (file)
--- a/docs/deployment.rst
+++ b/docs/deployment.rst
@@ -282,5 +282,5 @@ exhaustive.
 CPS-Core Docker Installation
 ============================
 
-CPS-Core can also be installed in a docker environment. Latest `docker-compose <https://github.com/onap/cps/blob/master/docker-compose/docker-compose.yml>`_ is included in the repo to start all the relevant services.
-The latest instructions are covered in the `README <https://github.com/onap/cps/blob/master/docker-compose/README.md>`_.
+CPS-Core can also be installed in a docker environment. `docker-compose <https://github.com/onap/cps/blob/jakarta/docker-compose/docker-compose.yml>`_ is included in the repo to start all the relevant services.
+The instructions are covered in the `README <https://github.com/onap/cps/blob/jakarta/docker-compose/README.md>`_.

diff --git a/docs/tox.ini b/docs/tox.ini
index 4e9449e..ac8cf64 100644 (file)
--- a/docs/tox.ini
+++ b/docs/tox.ini
@@ -6,8 +6,8 @@ skipsdist = true
 [testenv:docs]
 basepython = python3
 deps = -r{toxinidir}/requirements-docs.txt
-       -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
-       -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
+       -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt?h=jakarta
+       -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=jakarta
 commands =
     sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
     echo "Generated docs available in {toxinidir}/_build/html"
@@ -19,8 +19,8 @@ whitelist_externals =
 [testenv:docs-linkcheck]
 basepython = python3
 deps = -r{toxinidir}/requirements-docs.txt
-       -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
-       -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
+       -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt?h=jakarta
+       -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=jakarta
 commands = echo "Link Checking not enforced"
 #commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck
 whitelist_externals = echo