<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>1.4.2-SNAPSHOT</version>
- <relativePath></relativePath>
+ <version>1.5.0-SNAPSHOT</version>
+ <relativePath/>
</parent>
<prerequisites>
<maven>3.0</maven>
</prerequisites>
+
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-parent</artifactId>
- <version>0.0.3-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
+ <name>openflowplugin</name> <!-- Used by Sonar to set project name -->
<packaging>pom</packaging>
<scm>
<!-- OpenDayLight Released artifact -->
<repository>
<id>opendaylight-release</id>
- <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release</url>
+ <url>${nexusproxy}/repositories/opendaylight.release</url>
</repository>
<!-- OpenDayLight Snapshot artifact -->
<snapshotRepository>
<id>opendaylight-snapshot</id>
- <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot</url>
+ <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
</snapshotRepository>
<!-- Site deployment -->
<!-- site>
<properties>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
- <mdsal.version>1.1-SNAPSHOT</mdsal.version>
+ <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
<nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
- <openflowjava.version>0.5-SNAPSHOT</openflowjava.version>
- <controller.model.version>1.1-SNAPSHOT</controller.model.version>
- <sal.api.version>0.8.1-SNAPSHOT</sal.api.version>
- <sal.connection.api.version>0.1.2-SNAPSHOT</sal.connection.api.version>
- <netconf.parent.version>0.2.5-SNAPSHOT</netconf.parent.version>
- <config.parent.version>0.2.5-SNAPSHOT</config.parent.version>
+ <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
+ <controller.model.version>1.2.0-SNAPSHOT</controller.model.version>
+ <sal.api.version>0.9.0-SNAPSHOT</sal.api.version>
+ <sal.connection.api.version>0.2.0-SNAPSHOT</sal.connection.api.version>
+ <sal.common.util.version>1.2.0-SNAPSHOT</sal.common.util.version>
+ <netconf.parent.version>0.3.0-SNAPSHOT</netconf.parent.version>
+ <config.parent.version>0.3.0-SNAPSHOT</config.parent.version>
<build.helper.version>1.8</build.helper.version>
- <xtend.dstdir>src/main/xtend-gen</xtend.dstdir>
<jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
<exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
- <controller.distribution.version>0.1.2-SNAPSHOT</controller.distribution.version>
+ <controller.distribution.version>0.2.0-SNAPSHOT</controller.distribution.version>
<!-- Sonar config -->
<sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
<sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
<sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.profile>Sonar way with Findbugs</sonar.profile>
+
+ <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
+ <yang.binding.version>0.7.0-SNAPSHOT</yang.binding.version>
+ <dlux.version>0.2.0-SNAPSHOT</dlux.version>
+ <config.version>0.3.0-SNAPSHOT</config.version>
+ <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+ <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
+ <ietf-yang-types.version>2010.09.24.7-SNAPSHOT</ietf-yang-types.version>
+ <ietf-inet-types.version>2010.09.24.7-SNAPSHOT</ietf-inet-types.version>
+ <yang-ext.version>2013.09.07.7-SNAPSHOT</yang-ext.version>
</properties>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-binding</artifactId>
+ <version>${yang.binding.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-common</artifactId>
+ <version>${yang.binding.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools.model</groupId>
+ <artifactId>ietf-inet-types</artifactId>
+ <version>${ietf-inet-types.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools.model</groupId>
+ <artifactId>ietf-yang-types</artifactId>
+ <version>${ietf-yang-types.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools.model</groupId>
+ <artifactId>yang-ext</artifactId>
+ <version>${yang-ext.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools.model</groupId>
+ <artifactId>opendaylight-l2-types</artifactId>
+ <version>${opendaylight-l2-types.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.opendaylight.openflowplugin</groupId>
+ <artifactId>openflowplugin-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.opendaylight.openflowjava</groupId>
<artifactId>openflow-protocol-impl</artifactId>
<artifactId>model-inventory</artifactId>
<version>${controller.model.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller.model</groupId>
+ <artifactId>model-topology</artifactId>
+ <version>${controller.model.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-api</artifactId>
<version>${controller.model.version}</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal</artifactId>
- <version>${sal.api.version}</version>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-binding-config</artifactId>
+ <version>${controller.model.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-binding-util</artifactId>
+ <version>${controller.model.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>sal.connection</artifactId>
- <version>${sal.connection.api.version}</version>
+ <artifactId>liblldp</artifactId>
+ <version>${sal.api.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
<version>${controller.model.version}</version>
</dependency>
-
<!-- IT -->
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-common-util</artifactId>
+ <version>${sal.common.util.version}</version>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-netconf-connector</artifactId>
<dependency>
<groupId>org.opendaylight.controller.thirdparty</groupId>
<artifactId>ganymed</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
</dependency>
- <dependency>
- <groupId>org.opendaylight.yangtools.thirdparty</groupId>
- <artifactId>xtend-lib-osgi</artifactId>
- <version>2.4.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
<artifactId>maven-paxexam-plugin</artifactId>
<version>1.2.4</version>
</plugin>
- <plugin>
- <groupId>org.eclipse.xtend</groupId>
- <artifactId>xtend-maven-plugin</artifactId>
- <version>${xtend.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <outputDirectory>${xtend.dstdir}</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
- <fileset>
- <directory>${xtend.dstdir}</directory>
- <includes>
- <include>**</include>
- </includes>
- </fileset>
<fileset>
<directory>${jmxGeneratorPath}</directory>
<includes>
<sources>
<source>${jmxGeneratorPath}</source>
<source>${salGeneratorPath}</source>
- <source>${xtend.dstdir}</source>
</sources>
</configuration>
</execution>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>0.6.2-SNAPSHOT</version>
+ <version>${yang.binding.version}</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
</goals>
</pluginExecutionFilter>
<action>
- <execute></execute>
+ <execute/>
</action>
</pluginExecution>
<pluginExecution>
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
</plugins>
</reporting>
</profile>
+
+ <profile>
+ <id>nsf-migration</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <file>
+ <exists>${basedir}/migrationStep.1</exists>
+ </file>
+ </activation>
+
+ <properties>
+ <!-- TODO: pull out into parent -->
+ <openflowplugin.model.version>${project.version}</openflowplugin.model.version>
+ </properties>
+
+ <dependencyManagement>
+ <!-- TODO: pull out into parent -->
+ <dependencies>
+ <dependency>
+ <groupId>org.opendaylight.openflowplugin.model</groupId>
+ <artifactId>model-flow-base</artifactId>
+ <version>${openflowplugin.model.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.openflowplugin.model</groupId>
+ <artifactId>model-flow-service</artifactId>
+ <version>${openflowplugin.model.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.openflowplugin.model</groupId>
+ <artifactId>model-flow-statistics</artifactId>
+ <version>${openflowplugin.model.version}</version>
+ </dependency>
+
+ <!-- excluding old models pulled as transient dependencies
+ TODO: remove -->
+ <dependency>
+ <groupId>org.opendaylight.openflowplugin</groupId>
+ <artifactId>openflowplugin-api</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.opendaylight.controller.model</groupId>
+ <artifactId>model-flow-base</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.opendaylight.controller.model</groupId>
+ <artifactId>model-flow-service</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.opendaylight.controller.model</groupId>
+ <artifactId>model-flow-statistics</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-binding-broker-impl</artifactId>
+ <version>${controller.model.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.opendaylight.controller.model</groupId>
+ <artifactId>model-flow-base</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.opendaylight.controller.model</groupId>
+ <artifactId>model-flow-service</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.opendaylight.controller.model</groupId>
+ <artifactId>model-flow-statistics</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ </dependencyManagement>
+ </profile>
+
</profiles>
<repositories>
<module>openflowplugin</module>
<module>extension</module>
<module>distribution/base</module>
- <module>distribution/cbench</module>
+ <module>distribution/cbench</module>
+ <module>distribution/karaf</module>
<module>openflowplugin-controller-config</module>
<module>openflowplugin-it</module>
<module>test-provider</module>
<module>drop-test</module>
+ <module>drop-test-karaf</module>
+ <module>test-common</module>
<module>features</module>
<module>samples/sample-consumer</module>
<module>samples/learning-switch</module>
- </modules>
+ <module>applications</module>
+ <module>model</module>
+ <module>legacy</module>
+ </modules>
</project>