Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Updated flow capable models and affected code
[controller.git]
/
opendaylight
/
md-sal
/
model
/
pom.xml
diff --git
a/opendaylight/md-sal/model/pom.xml
b/opendaylight/md-sal/model/pom.xml
index f7d9241c93a0ae694946758d868bc5cedddab739..a5554822cd21792692fbd58dac97644a26bde62d 100644
(file)
--- a/
opendaylight/md-sal/model/pom.xml
+++ b/
opendaylight/md-sal/model/pom.xml
@@
-15,11
+15,9
@@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opendaylight.controller.model</groupId>
<artifactId>model-parent</artifactId>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opendaylight.controller.model</groupId>
<artifactId>model-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<packaging>pom</packaging>
<properties>
- <yang.version>0.5.7-SNAPSHOT</yang.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bundle.plugin.version>2.3.7</bundle.plugin.version>
</properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bundle.plugin.version>2.3.7</bundle.plugin.version>
</properties>
@@
-29,7
+27,7
@@
<module>model-flow-base</module>
<module>model-flow-service</module>
<module>model-flow-statistics</module>
<module>model-flow-base</module>
<module>model-flow-service</module>
<module>model-flow-statistics</module>
- <
!-- <module>model-topology-bgp</module> --
>
+ <
module>model-flow-management</module
>
</modules>
<build>
</modules>
<build>
@@
-37,7
+35,6
@@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<extensions>true</extensions>
<configuration>
<instructions>
@@
-74,7
+71,13
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
- <version>0.5.7-SNAPSHOT</version>
+ <version>${yang.codegen.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-binding</artifactId>
+ <version>${yang.codegen.version}</version>
<type>jar</type>
</dependency>
</dependencies>
<type>jar</type>
</dependency>
</dependencies>
@@
-142,27
+145,25
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-binding</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-binding</artifactId>
- <version>${yang.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-common</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-common</artifactId>
- <version>${yang.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>ietf-inet-types</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>ietf-inet-types</artifactId>
- <version>2010.09.24-SNAPSHOT</version>
+ <version>2010.09.24
.2
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>ietf-yang-types</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>ietf-yang-types</artifactId>
- <version>2010.09.24-SNAPSHOT</version>
+ <version>2010.09.24
.2
-SNAPSHOT</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.yangtools</groupId>
+ <groupId>org.opendaylight.yangtools
.model
</groupId>
<artifactId>yang-ext</artifactId>
<artifactId>yang-ext</artifactId>
- <version>2013.09.07-SNAPSHOT</version>
+ <version>2013.09.07
.1
-SNAPSHOT</version>
</dependency>
</dependencies>
</dependency>
</dependencies>