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 x.y.(z+1)
[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 fc38fb66c0bd5639d2b737acfbc19fca2c4a7935..d0ce9bfa286de7c36c90a38a03957ab566e13142 100644
(file)
--- a/
opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
+++ b/
opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
@@
-3,14
+3,14
@@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.opendaylight.
mdsal
</groupId>
- <artifactId>
binding
-parent</artifactId>
- <version>
0
.10.0-SNAPSHOT</version>
- <relativePath
/
>
+ <groupId>org.opendaylight.
controller
</groupId>
+ <artifactId>
mdsal
-parent</artifactId>
+ <version>
1
.10.0-SNAPSHOT</version>
+ <relativePath
>../../../parent</relativePath
>
</parent>
</parent>
- <groupId>org.opendaylight.controller</groupId>
- <version>1.
5
.0-SNAPSHOT</version>
+ <groupId>org.opendaylight.controller
.samples
</groupId>
+ <version>1.
10
.0-SNAPSHOT</version>
<artifactId>clustering-it-model</artifactId>
<packaging>bundle</packaging>
<artifactId>clustering-it-model</artifactId>
<packaging>bundle</packaging>
@@
-20,12
+20,10
@@
<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>
<Bundle-Name>org.opendaylight.controller.sal-clustering-it-model</Bundle-Name>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Name>org.opendaylight.controller.sal-clustering-it-model</Bundle-Name>
- <Import-Package>*</Import-Package>
</instructions>
</configuration>
</plugin>
</instructions>
</configuration>
</plugin>
@@
-34,12
+32,8
@@
</build>
<dependencies>
<dependency>
</build>
<dependencies>
<dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-inet-types-2013-07-15</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-yang-types-20130715</artifactId>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>