<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>2.0.5</version>
+ <version>3.0.2</version>
<relativePath/>
</parent>
<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>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-cert</artifactId>
<version>3.2.2</version>
</dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-filterchain</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>aaa-filterchain</artifactId>
+ </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.dependencymanager</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<!-- JSON JAXB Stuff -->
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-json-org</artifactId>
+ <groupId>org.immutables</groupId>
+ <artifactId>value</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-base</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <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.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <scope>provided</scope>
+ <groupId>org.opendaylight.aaa.web</groupId>
+ <artifactId>web-api</artifactId>
+ <version>${project.version}</version>
</dependency>
- <!-- Testing Dependencies -->
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.immutables</groupId>
- <artifactId>value</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <!-- Testing Dependencies -->
- <dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>7.0.0.pre5</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
- </dependency>
+ <dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ </dependency>
</dependencies>
<build>
<instructions>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
<Export-Package>
- 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.*,
+ <!-- TODO: This is temporary until we can find a better spot for GsonProvider. -->
+ org.opendaylight.aaa.provider,
+ org.opendaylight.aaa.shiro.web.env,
+ org.opendaylight.aaa.datastore.h2.*,
</Export-Package>
<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)",
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
+ org.slf4j.*,
+ net.sf.ehcache.*,
+ 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>
<type>xml</type>
<classifier>aaa-app-config</classifier>
</artifact>
- <artifact>
- <file>${project.build.directory}/classes/initial/aaa-datastore-config.xml</file>
- <type>xml</type>
- <classifier>aaa-datastore-config</classifier>
- </artifact>
- <!-- attach convert-shiro-ini-to-rest-payload.py as an artifact -->
<artifact>
- <file>${project.build.directory}/classes/convert-shiro-ini-to-rest-payload.py</file>
- <type>py</type>
- <classifier>convert-shiro-ini</classifier>
+ <file>${project.build.directory}/classes/initial/aaa-datastore-config.xml</file>
+ <type>xml</type>
+ <classifier>aaa-datastore-config</classifier>
</artifact>
</artifacts>
</configuration>