From: John  Keeney <john.keeney@est.tech>
Date: Mon, 15 May 2023 09:17:59 +0000 (+0000)
Subject: Merge "Small changes"
X-Git-Tag: 2.6.0~1
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=8800406c66372e08bc1705c21bce2f03758f5708;hp=3b14472b56f33cdc5025a7a8a787c18731659573;p=nonrtric%2Fplt%2Fa1policymanagementservice.git

Merge "Small changes"
---

diff --git a/docs/index.rst b/docs/index.rst
index ce78112..0b5d96a 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,9 +1,9 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. SPDX-License-Identifier: CC-BY-4.0
-.. Copyright (C) 2021 Nordix
+.. Copyright (C) 2023 Nordix
 
-Non-RT RIC A1 Policy Managent Service
-=====================================
+Non-RT RIC A1 Policy Management Service
+=======================================
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index 692a79f..f266a10 100644
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -1,7 +1,7 @@
 tox
 Sphinx
 doc8
-docutils
+docutils < 0.17
 setuptools
 six
 sphinx_rtd_theme
diff --git a/pom.xml b/pom.xml
index 61eb38e..00dee51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -268,6 +268,7 @@
                                         <cleanup>try</cleanup>
                                         <contextDir>${basedir}</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
+                                        <filter>false</filter>
                                         <args>
                                             <JAR>${project.build.finalName}.jar</JAR>
                                         </args>
@@ -295,6 +296,7 @@
                                     <build>
                                         <contextDir>${basedir}</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
+                                        <filter>false</filter>
                                         <args>
                                             <JAR>${project.build.finalName}.jar</JAR>
                                         </args>
diff --git a/tox.ini b/tox.ini
index 2705e16..00dd3b8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,7 @@ deps = -r{toxinidir}/docs/requirements-docs.txt
 commands =
     sphinx-build -W -b html -n -d {envtmpdir}/docs/doctrees ./docs/ {toxinidir}/docs/_build/html
     echo "Generated docs available in {toxinidir}/docs/_build/html"
-whitelist_externals = echo
+allowlist_externals = echo
 
 [testenv:docs-linkcheck]
 basepython = python3