Roll master for Montreal

[ccsdk/features.git] / sdnr / wt / oauth-provider / provider-osgi / pom.xml

diff --git a/sdnr/wt/oauth-provider/provider-osgi/pom.xml b/sdnr/wt/oauth-provider/provider-osgi/pom.xml
index f29cdde..3982173 100644 (file)
--- a/sdnr/wt/oauth-provider/provider-osgi/pom.xml
+++ b/sdnr/wt/oauth-provider/provider-osgi/pom.xml
@@ -28,13 +28,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.2.1</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-oauth-provider</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-features :: ${project.artifactId}</name>
@@ -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},
@@ -111,19 +112,26 @@
                             org.apache.shiro.authz,
                             org.apache.shiro.realm,
                             org.apache.shiro.subject,
+                            org.apache.shiro.web.filter.authz,
                             org.jolokia.osgi.security,
                             org.onap.ccsdk.features.sdnr.wt.common.http,
                             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.aaa.shiro.web.env,
                             org.opendaylight.mdsal.binding.api,
+                            org.opendaylight.mdsal.common.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,
                             org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214,
                             org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.http.authorization,
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.http.authorization.policies,
                             org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.http.permission,
+                            org.opendaylight.yangtools.concepts,
                             org.opendaylight.yangtools.yang.binding,
+                            org.opendaylight.yangtools.yang.common,
+                            org.osgi.service.http,
                             com.fasterxml.jackson.databind,
                             com.fasterxml.jackson.databind.deser.std,
                             com.fasterxml.jackson.databind.ser.std,
@@ -131,12 +139,15 @@
                             com.fasterxml.jackson.annotation,
                             com.fasterxml.jackson.core.type,
                             com.fasterxml.jackson.core,
-                            org.apache.commons.codec.binary
+                            org.apache.commons.codec.binary,
+                            com.google.common.base,
+                            com.google.common.collect,
+                            com.google.common.util.concurrent
                         </Import-Package>
                         <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>