X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=aaa-shiro%2Fimpl%2Fpom.xml;h=b076fb9de6fed8c0f1349ec5c46f7547f9f6bdf0;hb=3aaefa736ea182afe22af6651e5bbb7cc4f84512;hp=280d1ce767089a6b2f2f5626e4875a3f8e6ea0b9;hpb=8de983c96bcf2c613edc0889fcae1cebc62a98b9;p=aaa.git
diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index 280d1ce76..b076fb9de 100644
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -12,37 +12,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
4.0.0
- org.opendaylight.odlparent
- bundle-parent
- 2.0.5
-
+ org.opendaylight.aaa
+ aaa-parent
+ 0.8.0-SNAPSHOT
+ ../../parent
org.opendaylight.aaa
aaa-shiro
- 0.7.0-SNAPSHOT
+ 0.8.0-SNAPSHOT
ODL :: aaa :: ${project.artifactId}
bundle
-
-
-
- ${project.groupId}
- aaa-parent
- ${project.version}
- pom
- import
-
-
- ${project.groupId}
- aaa-artifacts
- ${project.version}
- pom
- import
-
-
-
-
${project.groupId}
@@ -51,8 +32,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
- com.sun.jersey
+ org.glassfish.jersey.core
jersey-client
+ 2.25.1
provided
@@ -84,6 +66,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
3.2.2
+
+ com.google.code.gson
+ gson
+
+
org.apache.felix
org.apache.felix.dependencymanager
@@ -104,91 +91,60 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
aaa-filterchain
- com.sun.jersey
- jersey-server
-
-
- javax.servlet
- javax.servlet-api
+ org.opendaylight.aaa
+ aaa-password-service-api
org.osgi
- org.osgi.core
+ org.osgi.compendium
- com.fasterxml.jackson.core
- jackson-core
+ org.eclipse.jetty
+ jetty-servlets
+ provided
+
- com.fasterxml.jackson.core
- jackson-annotations
+ net.sf.ehcache
+ ehcache
- com.fasterxml.jackson.core
- jackson-databind
+ com.h2database
+ h2
- com.fasterxml.jackson.datatype
- jackson-datatype-json-org
+ org.immutables
+ value
- com.fasterxml.jackson.jaxrs
- jackson-jaxrs-base
+ com.google.guava
+ guava
- com.fasterxml.jackson.jaxrs
- jackson-jaxrs-json-provider
+ org.apache.commons
+ commons-text
- com.fasterxml.jackson.module
- jackson-module-jaxb-annotations
+ org.jolokia
+ jolokia-osgi
- org.eclipse.jetty
- jetty-servlets
- provided
+ org.opendaylight.aaa.web
+ web-api
+
+
+ org.opendaylight.aaa.web
+ servlet-api
-
-
- net.sf.ehcache
- ehcache
-
-
- com.h2database
- h2
-
-
- org.immutables
- value
-
-
- com.google.guava
- guava
-
-
- org.apache.commons
- commons-lang3
-
-
-
+
junit
junit
test
-
- org.slf4j
- jul-to-slf4j
- 1.7.21
- test
-
-
- com.sun.jersey
- jersey-servlet
-
org.mockito
mockito-core
@@ -210,20 +166,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
test
- com.sun.jersey.jersey-test-framework
- jersey-test-framework-grizzly2
+ org.glassfish.jersey.test-framework.providers
+ jersey-test-framework-provider-grizzly2
+ 2.25.1
test
org.mortbay.jetty
jetty-servlet-tester
- 7.0.0.pre5
test
-
- com.google.truth
- truth
-
+
+ com.google.truth
+ truth
+
+
+ org.opendaylight.aaa
+ aaa-password-service-impl
+ test
+
@@ -236,61 +197,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
${project.groupId}.${project.artifactId}
- org.opendaylight.aaa.impl.shiro,
- org.opendaylight.aaa.impl.shiro.tokenauthrealm,
- org.opendaylight.aaa.impl.shiro.tokenauthrealm.auth,
+ org.opendaylight.aaa,
+ org.opendaylight.aaa.shiro,
+ org.opendaylight.aaa.shiro.idm,
+ org.opendaylight.aaa.shiro.tokenauthrealm,
+ org.opendaylight.aaa.shiro.tokenauthrealm.auth,
org.opendaylight.aaa.shiro,
org.opendaylight.aaa.shiro.filters,
org.opendaylight.aaa.shiro.realm,
- org.opendaylight.aaa.shiro.web.env,
- org.opendaylight.aaa.impl.datastore.h2.*,
+
+ org.opendaylight.aaa.provider,
+ org.opendaylight.aaa.shiro.web.env,
+ org.opendaylight.aaa.datastore.h2.*,
- com.google.*,
- com.sun.jersey.spi.container.servlet,
- javax.servlet.http,
- javax.servlet.*,
- org.apache.oltu.oauth2.*,
- 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.felix.dm,
- org.apache.shiro.web.env,org.apache.shiro.authc,
- org.eclipse.jetty.servlets;version="[8.1,10)",
- org.opendaylight.*,
- org.osgi.framework,
- org.osgi.util.tracker,
- org.osgi.service.cm.*,
- org.osgi.service.http.*,
- org.apache.shiro.web.*,
- 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
+ !javax.annotation,
+ *
- h2;scope=compile|runtime;inline=true
- /auth
@@ -318,16 +241,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
xml
aaa-app-config
-
- ${project.build.directory}/classes/initial/aaa-datastore-config.xml
- xml
- aaa-datastore-config
-
-
- ${project.build.directory}/classes/convert-shiro-ini-to-rest-payload.py
- py
- convert-shiro-ini
+ ${project.build.directory}/classes/initial/aaa-datastore-config.xml
+ xml
+ aaa-datastore-config