summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/oauth-provider/provider-osgi
diff options
context:
space:
mode:
authorMichael DÜrre <michael.duerre@highstreet-technologies.com>2021-11-03 14:17:33 +0100
committerDan Timoney <dtimoney@att.com>2021-11-11 09:26:55 -0500
commitcbab1f4a926a86d0d4fcc046451ff502bd3290d0 (patch)
tree4eb20caff39f14fe3a6443df26d25539af1f095c /sdnr/wt/oauth-provider/provider-osgi
parent301049fb253568986d00c22feb64c89603de8588 (diff)
mirgate features to sr2
fix oauth provider and its aaa deps Issue-ID: CCSDK-3515 Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com> Change-Id: I5e964958f323483e593563f5f19cee6100108b21 Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Diffstat (limited to 'sdnr/wt/oauth-provider/provider-osgi')
-rw-r--r--sdnr/wt/oauth-provider/provider-osgi/pom.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/sdnr/wt/oauth-provider/provider-osgi/pom.xml b/sdnr/wt/oauth-provider/provider-osgi/pom.xml
index 01cf38da6..57802e357 100644
--- a/sdnr/wt/oauth-provider/provider-osgi/pom.xml
+++ b/sdnr/wt/oauth-provider/provider-osgi/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.3.0</version>
+ <version>2.3.1</version>
<relativePath/>
</parent>
@@ -61,7 +61,7 @@
<artifactId>aaa-shiro</artifactId>
</exclusion>
<exclusion>
- <groupId>com.highstreet-technologies.aaa</groupId>
+ <groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-shiro</artifactId>
</exclusion>
<exclusion>
@@ -87,6 +87,7 @@
<Bundle-Version>${project.version}</Bundle-Version>
<Export-Package>
org.onap.ccsdk.features.sdnr.wt.oauthprovider;version=${project.version},
+ org.onap.ccsdk.features.sdnr.wt.oauthprovider.filters;version=${project.version},
org.onap.ccsdk.features.sdnr.wt.oauthprovider.http;version=${project.version},
org.onap.ccsdk.features.sdnr.wt.oauthprovider.http.client;version=${project.version},
org.onap.ccsdk.features.sdnr.wt.oauthprovider.data;version=${project.version},
@@ -116,7 +117,7 @@
org.opendaylight.aaa.api,
org.opendaylight.aaa.api.shiro.principal,
org.opendaylight.aaa.shiro.realm,
- org.opendaylight.aaa.shiro.filters.backport,
+ org.opendaylight.aaa.shiro.filters,
org.opendaylight.mdsal.binding.api,
org.opendaylight.yang.gen.v1.urn.opendaylight.aaa.app.config.rev170619,
org.opendaylight.yang.gen.v1.urn.opendaylight.aaa.app.config.rev170619.shiro.configuration,
@@ -136,7 +137,7 @@
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
<Embed-Dependency>*;scope=compile|runtime;artifactId=!shiro-core;inline=false</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
- <Fragment-Host>org.apache.shiro.core</Fragment-Host>
+ <Fragment-Host>org.opendaylight.aaa.repackaged-shiro</Fragment-Host>
</instructions>
</configuration>
</plugin>