diff options
| author |   Michael DÜrre <michael.duerre@highstreet-technologies.com> | 2021-07-07 07:23:44 +0200 |
|---|---|---|
| committer | Michael DÜrre <michael.duerre@highstreet-technologies.com> | 2021-07-07 07:23:58 +0200 |
| commit | 482a20f6d8812da892c1389fea214afe9b8b2194 (patch) | |
| tree | 8ad91af4b6199dbe896d0e79a49dbc9be87679dd /opendaylight/silicon | |
| parent | fad067ba91e315671100c18563d992eb1560132d (diff) | |
migrate odl to silicon-sr1
switched to 0.14.1 and adapt patches
Issue-ID: CCSDK-3364
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: Idcf66d78f516898f568d4c3014d10c37a4702380
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Diffstat (limited to 'opendaylight/silicon')
| -rw-r--r-- | opendaylight/silicon/pom.xml | 2 | ||||
| -rw-r--r-- | opendaylight/silicon/silicon-alpine/pom.xml | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/opendaylight/silicon/pom.xml b/opendaylight/silicon/pom.xml index 45107bf0..02e19ed0 100644 --- a/opendaylight/silicon/pom.xml +++ b/opendaylight/silicon/pom.xml @@ -19,7 +19,7 @@ </modules> <properties> - <ccsdk.opendaylight.version>0.14.0</ccsdk.opendaylight.version> + <ccsdk.opendaylight.version>0.14.1</ccsdk.opendaylight.version> </properties> <dependencyManagement> diff --git a/opendaylight/silicon/silicon-alpine/pom.xml b/opendaylight/silicon/silicon-alpine/pom.xml index 414f3766..c2f0a37c 100644 --- a/opendaylight/silicon/silicon-alpine/pom.xml +++ b/opendaylight/silicon/silicon-alpine/pom.xml @@ -20,7 +20,8 @@ <properties> <image.name>onap/ccsdk-odl-silicon-alpine-image</image.name> <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId> - <odl.shiro.version>0.13.2</odl.shiro.version> + <odl.shiro.version>0.13.3</odl.shiro.version> + <odl.ops4j.version>7.3.13</odl.ops4j.version> </properties> <build> @@ -94,6 +95,14 @@ <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> |