<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-parent</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<prerequisites>
<maven>3.0.4</maven>
<properties>
<!-- Karaf -->
- <karaf.branding.version>1.2.0-SNAPSHOT</karaf.branding.version>
- <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
-
- <!-- OSGi -->
- <osgi.metatype.version>1.0.10</osgi.metatype.version>
+ <karaf.branding.version>1.4.0-SNAPSHOT</karaf.branding.version>
+ <karaf.resources.version>1.8.0-SNAPSHOT</karaf.resources.version>
<!-- Local project version, needed for import -->
<aaa.version>${project.version}</aaa.version>
<parent-path>${basedir}</parent-path>
<!-- AuthZ -->
- <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
- <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
- <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
- <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
- <restconf.version>1.3.0-SNAPSHOT</restconf.version>
- <config.version>0.4.0-SNAPSHOT</config.version>
- <config.authz.service.configfile>08-authz-config.xml</config.authz.service.configfile>
+ <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
+ <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
+ <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
+ <controller.mdsal.version>1.5.0-SNAPSHOT</controller.mdsal.version>
+ <restconf.version>1.5.0-SNAPSHOT</restconf.version>
+ <config.version>0.6.0-SNAPSHOT</config.version>
<config.restconf.configfile>09-rest-connector.xml</config.restconf.configfile>
<config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
<!-- AuthN -->
<glassfish.json.version>1.0.4</glassfish.json.version>
- <servlet.api.version>2.5</servlet.api.version>
<ehcache.version>2.8.3</ehcache.version>
<jta.version>1.1.1</jta.version>
<oltu.version>1.0.0</oltu.version>
<config.authn.store.configfile>08-authn-config.xml</config.authn.store.configfile>
- <!-- IdmLight -->
- <h2.version>1.4.185</h2.version>
-
<!-- Keystone plugin -->
<httpclient.version>4.4</httpclient.version>
<!-- Test -->
<javax.inject.version>1</javax.inject.version>
- <servlet.tester.version>7.0.0.M2</servlet.tester.version>
- <features.test.version>1.6.0-SNAPSHOT</features.test.version>
+ <servlet.tester.version>7.0.0.pre5</servlet.tester.version>
+ <features.test.version>1.8.0-SNAPSHOT</features.test.version>
</properties>
<dependencyManagement>
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
+ <groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
<version>${mdsal.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>config-artifacts</artifactId>
- <version>${config.version}</version>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>mdsal-model-artifacts</artifactId>
+ <version>${mdsal.model.version}</version>
+ <scope>import</scope>
<type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>mdsal-artifacts</artifactId>
+ <version>${controller.mdsal.version}</version>
<scope>import</scope>
+ <type>pom</type>
</dependency>
<dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>restconf-artifacts</artifactId>
- <version>${restconf.version}</version>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>config-artifacts</artifactId>
+ <version>${config.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<artifactId>javax.json</artifactId>
<version>${glassfish.json.version}</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet.api.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
- <version>${osgi.metatype.version}</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>${ehcache.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${jta.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.common</artifactId>
<artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
<version>${oltu.version}</version>
</dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
- </dependency>
<!-- Test stuff -->
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2</artifactId>
- <version>${jersey.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet-tester</artifactId>
- <version>${servlet.tester.version}</version>
- <scope>test</scope>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-servlet-tester</artifactId>
+ <version>${servlet.tester.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <!-- checkstyle is evil -->
- <skip>false</skip>
- <failOnViolation>false</failOnViolation>
+ <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+
<configLocation>checkstyle-logging.xml</configLocation>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <sourceDirectory>${project.basedir}</sourceDirectory>
- <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang</includes>
- <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/</excludes>
</configuration>
<executions>
<execution>