Refactor AAAShiroProvider & Co. to be non static

[aaa.git] / aaa-shiro / impl / pom.xml

diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index 75a65919f9b53ab53e28a9fa7d8c2404a84b15c9..33e636cfe57175671cbdc9ec083cef5aa4f1ac80 100644 (file)
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -20,7 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>aaa-shiro</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.8.0-SNAPSHOT</version>
     <name>ODL :: aaa :: ${project.artifactId}</name>
     <packaging>bundle</packaging>
 
@@ -120,10 +120,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
 
         <!-- JSON JAXB Stuff -->
         <dependency>
@@ -150,7 +146,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jolokia</groupId>
+            <artifactId>jolokia-osgi</artifactId>
+            <!-- TODO: remove once this version is propagated to odlparent -->
+            <version>1.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.aaa.web</groupId>
+            <artifactId>web-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Testing Dependencies -->
@@ -232,16 +239,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                         <Import-Package>
                             com.google.*,
                             com.sun.jersey.spi.container.servlet,
+                            com.sun.jersey.api.client.config,
                             javax.servlet.http,
                             javax.servlet.*,
+                            javax.net.ssl,
                             org.apache.oltu.oauth2.*,
                             javax.ws.rs.ext,
                             javax.ws.rs,javax.ws.rs.core,
                             javax.xml.bind.annotation,
                             org.opendaylight.aaa.*,
                             org.opendaylight.aaa.api.*,
-                            org.opendaylight.aaa.filterchain.filters,
                             org.xml.sax,
+                            org.apache.commons.text,
                             org.apache.felix.dm,
                             org.apache.shiro.web.env,org.apache.shiro.authc,
                             org.eclipse.jetty.servlets;version="[8.1,10)",
@@ -254,28 +263,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                             org.apache.shiro.*,
                             org.slf4j.*,
                             net.sf.ehcache.*,
-                            !javax.naming,
-                            !javax.naming.spi,
-                            !javax.servlet,
-                            !javax.servlet.http,
-                            !javax.tools,
-                            !javax.transaction.xa,
-                            !org.apache.lucene.analysis,
-                            !org.apache.lucene.analysis.standard,
-                            !org.apache.lucene.document,
-                            !org.apache.lucene.index,
-                            !org.apache.lucene.queryParser,
-                            !org.apache.lucene.search,
-                            !org.apache.lucene.store,
-                            !org.apache.lucene.util,
-                            !com.vividsolutions.jts.geom,
-                            !com.vividsolutions.jts.io,
-                            !org.osgi.service.jdbc,
-                            !javax.annotation,
-                            !javax.naming
+                            org.jolokia.osgi.security,
+                            org.osgi.service.blueprint.container,
+                            org.ops4j.pax.web.service,
+                            org.h2.*,
                         </Import-Package>
-                        <Embed-Dependency>h2;scope=compile|runtime;inline=true</Embed-Dependency>
-                        <Web-ContextPath>/auth</Web-ContextPath>
                     </instructions>
                 </configuration>
             </plugin>