diff options
| -rw-r--r-- | docs/requirements-docs.txt | 3 | ||||
| -rw-r--r-- | docs/tox.ini | 6 | ||||
| -rw-r--r-- | opendaylight/argon/argon-alpine/pom.xml | 13 |
3 files changed, 16 insertions, 6 deletions
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index ba3e0ec0..cc2eebf4 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -4,4 +4,5 @@ sphinxcontrib-blockdiag # BSD sphinxcontrib-seqdiag # BSD sphinxcontrib-swaggerdoc sphinxcontrib-spelling -sphinxcontrib-plantuml
\ No newline at end of file +sphinxcontrib-plantuml +six
\ No newline at end of file diff --git a/docs/tox.ini b/docs/tox.ini index 379d8e42..102f6754 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -7,7 +7,7 @@ skipsdist = true basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt - -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt + -chttps://releases.openstack.org/constraints/upper/yoga -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master commands = sphinx-build -W -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html @@ -21,7 +21,7 @@ allowlist_externals = basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt - -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt + -chttps://releases.openstack.org/constraints/upper/yoga -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 @@ -31,7 +31,7 @@ allowlist_externals = echo basepython = python3.8 deps = -r{toxinidir}/requirements-docs.txt - -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt + -chttps://releases.openstack.org/constraints/upper/yoga -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt?h=master commands = sphinx-build -W -q -b spelling -d {envtmpdir}/doctrees {toxinidir} {toxinidir}/_build/spellcheck diff --git a/opendaylight/argon/argon-alpine/pom.xml b/opendaylight/argon/argon-alpine/pom.xml index 7eb59866..8a373589 100644 --- a/opendaylight/argon/argon-alpine/pom.xml +++ b/opendaylight/argon/argon-alpine/pom.xml @@ -21,6 +21,7 @@ <image.name>onap/ccsdk-odl-argon-alpine-image</image.name> <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId> <odl.shiro.version>0.17.11</odl.shiro.version> + <odl.ops4j.version>8.0.15</odl.ops4j.version> </properties> <build> @@ -78,14 +79,22 @@ </goals> <configuration> <artifactItems> - <artifactItem> + <artifactItem> <groupId>com.highstreet-technologies.aaa</groupId> <artifactId>aaa-authn-api</artifactId> - <version>0.17.8</version> + <version>${odl.shiro.version}</version> <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version}</outputDirectory> <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName> <excludes>*</excludes> </artifactItem> + <artifactItem> + <groupId>com.highstreet-technologies.ops4j.pax.web</groupId> + <artifactId>pax-web-jetty</artifactId> + <version>${odl.ops4j.version}</version> + <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/web/pax-web-jetty/${odl.ops4j.version}</outputDirectory> + <destFileName>pax-web-jetty-${odl.ops4j.version}.jar</destFileName> + <excludes>*</excludes> + </artifactItem> </artifactItems> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>true</overWriteSnapshots> |