terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.18.4</version>
<relativePath>../../parent</relativePath>
</parent>
- <groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-shiro</artifactId>
- <version>0.8.0-SNAPSHOT</version>
<name>ODL :: aaa :: ${project.artifactId}</name>
<packaging>bundle</packaging>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>aaa-shiro-api</artifactId>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>aaa-authn-api</artifactId>
</dependency>
-
- <!-- jersey client for moon authN -->
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <scope>provided</scope>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>aaa-shiro-api</artifactId>
</dependency>
- <!-- OAuth2 dependencies for moon -->
<dependency>
- <groupId>org.apache.oltu.oauth2</groupId>
- <artifactId>org.apache.oltu.oauth2.authzserver</artifactId>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>aaa-tokenauthrealm</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.oltu.oauth2</groupId>
- <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>aaa-idm-store-h2</artifactId>
</dependency>
+
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-cert</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-web</artifactId>
- </dependency>
- <!-- Enforce newer commons-beanutils and commons-collections versions -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>repackaged-shiro</artifactId>
</dependency>
<dependency>
<artifactId>gson</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.dependencymanager</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!--Yang Binding -->
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-common-util</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-api</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-filterchain</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>aaa-password-service-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.service.http.whiteboard</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <optional>true</optional>
</dependency>
-
- <!-- JSON JAXB Stuff -->
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <scope>provided</scope>
+ <groupId>com.guicedee.services</groupId>
+ <artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<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>
+ <classifier>annotations</classifier>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <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 -->
<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>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>test</scope>
+ <groupId>org.opendaylight.aaa.web</groupId>
+ <artifactId>servlet-api</artifactId>
</dependency>
+
+ <!-- Testing Dependencies -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-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.inject</groupId>
+ <artifactId>jersey-hk2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-servlet-tester</artifactId>
- <version>7.0.0.pre5</version>
+ <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+ <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
+ <groupId>org.opendaylight.aaa</groupId>
+ <artifactId>aaa-password-service-impl</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
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,
<!-- 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.shiro.web.env
</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.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.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.*,
- org.jolokia.osgi.security,
- org.osgi.service.blueprint.container,
- org.ops4j.pax.web.service,
- org.h2.*,
+ !javax.annotation,
+ *
</Import-Package>
+
+ <!-- FIXME: AAA-205: remove this block -->
+ <Provide-Capability>
+ osgi.service;objectClass:List<String>="javax.servlet.Servlet";uses:="javax.servlet",
+ osgi.service;objectClass:List<String>="org.jolokia.osgi.security.Authenticator";uses:="org.jolokia.osgi.security",
+ osgi.service;objectClass:List<String>="org.opendaylight.aaa.api.ClaimCache,org.opendaylight.aaa.api.CredentialAuth,org.opendaylight.aaa.api.IdMService,org.opendaylight.aaa.api.PasswordCredentialAuth";uses:="org.opendaylight.aaa.api,org.opendaylight.aaa.api,org.opendaylight.aaa.api,org.opendaylight.aaa.api",
+ osgi.service;objectClass:List<String>="org.opendaylight.aaa.web.WebContextSecurer";uses:="org.opendaylight.aaa.web"
+ osgi.service;objectClass:List<String>="org.opendaylight.aaa.shiro.web.env.AAAShiroWebEnvironment";uses:="org.opendaylight.aaa.shiro.web.env",
+ </Provide-Capability>
</instructions>
</configuration>
</plugin>
Code Review / aaa.git / blobdiff