summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Dürre <michael.duerre@highstreet-technologies.com>2024-03-26 13:32:36 +0100
committerMichael Dürre <michael.duerre@highstreet-technologies.com>2024-03-26 13:32:46 +0100
commit78a6ceb2c78f0419a0a00839ea530eb8403b908e (patch)
tree9549494a3ec58718aba633aad42fef4999db9481
parentb8159ed0db0b4ecdee533035811f114f0ee31e97 (diff)
fix odl patchesHEADmaster
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>
-rw-r--r--opendaylight/argon/argon-alpine/pom.xml13
1 files changed, 11 insertions, 2 deletions
diff --git a/opendaylight/argon/argon-alpine/pom.xml b/opendaylight/argon/argon-alpine/pom.xml
index bfa0b515..fb73c666 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>