Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump versions by 0.1.0 for next dev cycle
[controller.git]
/
opendaylight
/
md-sal
/
samples
/
clustering-test-app
/
model
/
pom.xml
diff --git
a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
index a23e32df2b91e0971e154c2c3f599886423bd7db..55fa13c0a71b9098556b71de41e80c311f69ef34 100644
(file)
--- a/
opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
+++ b/
opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
@@
-4,8
+4,9
@@
<parent>
<artifactId>clustering-it</artifactId>
<groupId>org.opendaylight.controller.samples</groupId>
<parent>
<artifactId>clustering-it</artifactId>
<groupId>org.opendaylight.controller.samples</groupId>
- <version>1.
1
-SNAPSHOT</version>
+ <version>1.
5.0
-SNAPSHOT</version>
</parent>
</parent>
+ <!-- FIXME Use org.opendaylight.mdsal:binding-parent -->
<artifactId>clustering-it-model</artifactId>
<packaging>bundle</packaging>
<artifactId>clustering-it-model</artifactId>
<packaging>bundle</packaging>
@@
-37,7
+38,7
@@
<codeGenerators>
<generator>
<codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
<codeGenerators>
<generator>
<codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
- <outputBaseDir>
target/generated-sources/sal
</outputBaseDir>
+ <outputBaseDir>
${salGeneratorPath}
</outputBaseDir>
</generator>
</codeGenerators>
<inspectDependencies>true</inspectDependencies>
</generator>
</codeGenerators>
<inspectDependencies>true</inspectDependencies>
@@
-46,9
+47,9
@@
</executions>
<dependencies>
<dependency>
</executions>
<dependencies>
<dependency>
- <groupId>org.opendaylight.
yangtools
</groupId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
- <version>${
yangtools
.version}</version>
+ <version>${
mdsal.model
.version}</version>
<type>jar</type>
</dependency>
</dependencies>
<type>jar</type>
</dependency>
</dependencies>
@@
-87,9
+88,9
@@
</build>
<dependencies>
<dependency>
</build>
<dependencies>
<dependency>
- <groupId>org.opendaylight.
yangtools
</groupId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
<artifactId>yang-binding</artifactId>
<artifactId>yang-binding</artifactId>
- <version>
${yangtools.version}
</version>
+ <version>
0.10.0-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
@@
-97,17
+98,17
@@
<version>${yangtools.version}</version>
</dependency>
<dependency>
<version>${yangtools.version}</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.
yangtools
.model</groupId>
- <artifactId>ietf-inet-types</artifactId>
+ <groupId>org.opendaylight.
mdsal
.model</groupId>
+ <artifactId>ietf-inet-types
-2013-07-15
</artifactId>
<version>${ietf-inet-types.version}</version>
</dependency>
<dependency>
<version>${ietf-inet-types.version}</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.
yangtools
.model</groupId>
- <artifactId>ietf-yang-types</artifactId>
+ <groupId>org.opendaylight.
mdsal
.model</groupId>
+ <artifactId>ietf-yang-types
-20130715
</artifactId>
<version>${ietf-yang-types.version}</version>
</dependency>
<dependency>
<version>${ietf-yang-types.version}</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.
yangtools
.model</groupId>
+ <groupId>org.opendaylight.
mdsal
.model</groupId>
<artifactId>yang-ext</artifactId>
<version>${yang-ext.version}</version>
</dependency>
<artifactId>yang-ext</artifactId>
<version>${yang-ext.version}</version>
</dependency>