This patch is part 1 of 2 patches.
* To break the cyclic dependency, this patch temporarily stops running
the authz feature tests.
Change-Id: I059c96be0f702a98df11ba7c85ed2db96861cfcd
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa.project</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>aaa-authn-api</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<build>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa.project</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>aaa-authn-basic</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa.project</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>aaa-authn-federation</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa.project</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>aaa-authn-keystone</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<parent>
<artifactId>aaa-authn-mdsal-store</artifactId>
<groupId>org.opendaylight.aaa</groupId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>aaa-authn-mdsal-api</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<dependencies>
<dependency>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-authn-mdsal-store</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
</parent>
<artifactId>aaa-authn-mdsal-config</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<description>AuthN Token Store Service Configuration file </description>
<packaging>jar</packaging>
<parent>
<artifactId>aaa-authn-mdsal-store</artifactId>
<groupId>org.opendaylight.aaa</groupId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>aaa-authn-mdsal-store-impl</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-authn-api</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-authn</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-authn-mdsal-api</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
</dependency>
<!-- Test dependencies -->
<parent>
<artifactId>aaa.project</artifactId>
<groupId>org.opendaylight.aaa</groupId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>aaa-authn-mdsal-store</artifactId>
<name>${project.artifactId}</name>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa.project</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>aaa-authn-odl-plugin</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa.project</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>aaa-authn-sssd</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa.project</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>aaa-authn-store</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa.project</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>aaa-authn-sts</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa.project</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>aaa-authn</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<parent>
<artifactId>aaa-authz</artifactId>
<groupId>org.opendaylight.aaa</groupId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>aaa-authz</artifactId>
<groupId>org.opendaylight.aaa</groupId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<artifactId>aaa-authz</artifactId>
<groupId>org.opendaylight.aaa</groupId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>aaa-authz</artifactId>
<groupId>org.opendaylight.aaa</groupId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>aaa.project</artifactId>
<groupId>org.opendaylight.aaa</groupId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>aaa-authz</artifactId>
<name>${project.artifactId}</name>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<parent>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>binding-parent</artifactId>
- <version>0.7.0-Lithium</version>
+ <version>0.7.1-SNAPSHOT</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-credential-store-api</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<properties>
- <mdsal.version>1.2.0-Lithium</mdsal.version>
+ <mdsal.version>1.2.1-SNAPSHOT</mdsal.version>
</properties>
<dependencies>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa.project</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>aaa-idmlight</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa.project</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>aaa-authn-idpmapping</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>1.5.0-Lithium</version>
+ <version>1.5.1-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>commons.aaa</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<prerequisites>
<maven>3.0.4</maven>
<properties>
<!-- Karaf -->
- <karaf.branding.version>1.1.0-Lithium</karaf.branding.version>
- <karaf.resources.version>1.5.0-Lithium</karaf.resources.version>
- <karaf.empty.version>1.5.0-Lithium</karaf.empty.version>
+ <karaf.branding.version>1.1.1-SNAPSHOT</karaf.branding.version>
+ <karaf.resources.version>1.5.1-SNAPSHOT</karaf.resources.version>
+ <karaf.empty.version>1.5.1-SNAPSHOT</karaf.empty.version>
<!-- Plugins -->
<compiler.plugin.version>3.1</compiler.plugin.version>
<osgi.metatype.version>1.0.10</osgi.metatype.version>
<!-- AuthZ -->
- <yangtools.version>0.7.0-Lithium</yangtools.version>
+ <yangtools.version>0.7.1-SNAPSHOT</yangtools.version>
<jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
- <mdsal.version>1.2.0-Lithium</mdsal.version>
- <restconf.version>1.2.0-Lithium</restconf.version>
- <config.version>0.3.0-Lithium</config.version>
+ <mdsal.version>1.2.1-SNAPSHOT</mdsal.version>
+ <restconf.version>1.2.1-SNAPSHOT</restconf.version>
+ <config.version>0.3.1-SNAPSHOT</config.version>
<config.authz.service.configfile>08-authz-config.xml</config.authz.service.configfile>
<config.restconf.configfile>09-rest-connector.xml</config.restconf.configfile>
<config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
<config.authn.store.configfile>08-authn-config.xml</config.authn.store.configfile>
<!-- Netconf plugin -->
- <netconf.version>0.3.0-Lithium</netconf.version>
+ <netconf.version>0.3.1-SNAPSHOT</netconf.version>
<!-- IdmLight -->
<h2.version>1.4.185</h2.version>
<!-- Test -->
<javax.inject.version>1</javax.inject.version>
<servlet.tester.version>7.0.0.M2</servlet.tester.version>
- <features.test.version>1.5.0-Lithium</features.test.version>
+ <features.test.version>1.5.1-SNAPSHOT</features.test.version>
</properties>
<dependencyManagement>
<parent>
<artifactId>aaa.project</artifactId>
<groupId>org.opendaylight.aaa</groupId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>distribution-karaf</artifactId>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>features-aggregator</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>features-aggregator</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>features-aggregator</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
</dependency>
<!-- test to validate features.xml -->
+ <!-- TEMPORARILY DISABLE TO BREAK CYCLIC DEPENDENCY
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>features-test</artifactId>
<version>${features.test.version}</version>
<scope>test</scope>
</dependency>
+ -->
<!-- dependency for opendaylight-karaf-empty for use by testing -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
<parent>
<artifactId>aaa.project</artifactId>
<groupId>org.opendaylight.aaa</groupId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.opendaylight.aaa</groupId>
<parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>commons.aaa</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>commons/parent</relativePath>
</parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa.project</artifactId>
- <version>0.2.0-Lithium</version>
+ <version>0.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>aaa</name> <!-- Used by Sonar to set project name -->
<prerequisites>