<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-parent</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <version>0.4.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.3.0-SNAPSHOT</karaf.branding.version>
+ <karaf.resources.version>1.7.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>
+ <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
<jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
- <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
- <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
- <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
- <restconf.version>1.3.0-SNAPSHOT</restconf.version>
- <config.version>0.4.0-SNAPSHOT</config.version>
+ <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
+ <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+ <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
+ <restconf.version>1.4.0-SNAPSHOT</restconf.version>
+ <config.version>0.5.0-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>
<!-- IdmLight -->
- <h2.version>1.4.185</h2.version>
+ <h2.version>1.4.191</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.7.0-SNAPSHOT</features.test.version>
</properties>
<dependencyManagement>
<artifactId>javax.json</artifactId>
<version>${glassfish.json.version}</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${jersey2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-common</artifactId>
- <version>${jersey2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey2.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>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
- <version>${jersey2.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>
<configuration>
<!-- checkstyle is evil -->
<skip>false</skip>
- <failOnViolation>false</failOnViolation>
+ <failOnViolation>true</failOnViolation>
<configLocation>checkstyle-logging.xml</configLocation>
<consoleOutput>true</consoleOutput>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${jmxGeneratorPath}</source>
+ <source>${salGeneratorPath}</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>