<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.opendaylight.odlparent</groupId>
- <artifactId>bundle-parent</artifactId>
- <version>3.0.2</version>
- <relativePath/>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>aaa-parent</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <relativePath>../../parent</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>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>aaa-parent</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>aaa-artifacts</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<!-- jersey client for moon authN -->
<dependency>
- <groupId>com.sun.jersey</groupId>
+ <groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
+ <version>2.25.1</version>
<scope>provided</scope>
</dependency>
<!-- OAuth2 dependencies for moon -->
<artifactId>aaa-filterchain</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>aaa-password-service-api</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
+
+ <!-- JSON JAXB Stuff -->
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <scope>provided</scope>
</dependency>
- <!-- JSON JAXB Stuff -->
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <groupId>org.immutables</groupId>
+ <artifactId>value</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-json-org</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-base</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>org.jolokia</groupId>
+ <artifactId>jolokia-osgi</artifactId>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <groupId>org.opendaylight.aaa.web</groupId>
+ <artifactId>web-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <scope>provided</scope>
+ <groupId>org.opendaylight.aaa.web</groupId>
+ <artifactId>servlet-api</artifactId>
</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 -->
+ <!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- <version>1.7.21</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2</artifactId>
+ <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+ <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+ <version>2.25.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-servlet-tester</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>
+ <dependency>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>aaa-password-service-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<instructions>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
<Export-Package>
+ org.opendaylight.aaa,
org.opendaylight.aaa.shiro,
org.opendaylight.aaa.shiro.idm,
org.opendaylight.aaa.shiro.tokenauthrealm,
org.opendaylight.aaa.shiro,
org.opendaylight.aaa.shiro.filters,
org.opendaylight.aaa.shiro.realm,
+ <!-- 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.*,
- org.opendaylight.aaa.provider
</Export-Package>
<Import-Package>
- 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,
+ *
</Import-Package>
- <Embed-Dependency>h2;scope=compile|runtime;inline=true</Embed-Dependency>
- <Web-ContextPath>/auth</Web-ContextPath>
</instructions>
</configuration>
</plugin>