fix aaa-authn api version and add pax fix
Issue-ID: CCSDK-4002
Change-Id: I4e8ef736c48fd2fa5510a25ea90a5edc9dcfaa04
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
(cherry picked from commit
78a6ceb2c78f0419a0a00839ea530eb8403b908e)
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
sphinxcontrib-seqdiag # BSD
sphinxcontrib-swaggerdoc
sphinxcontrib-spelling
-sphinxcontrib-plantuml
\ No newline at end of file
+sphinxcontrib-plantuml
+six
\ No newline at end of file
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
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
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
<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>
</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>