Code Review
/
openflowplugin.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+1).z for next dev cycle
[openflowplugin.git]
/
samples
/
sample-consumer
/
pom.xml
diff --git
a/samples/sample-consumer/pom.xml
b/samples/sample-consumer/pom.xml
index 9ffbb56470c85c70f347f5d8cbdd5e52fa75db6c..9c35fcbaac11967aed38cf1341e93495022d01a5 100644
(file)
--- a/
samples/sample-consumer/pom.xml
+++ b/
samples/sample-consumer/pom.xml
@@
-4,25
+4,19
@@
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-parent</artifactId>
<parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-parent</artifactId>
- <version>0.
0.3
-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <version>0.
5.0
-SNAPSHOT</version>
+ <relativePath>../../
parent
</relativePath>
</parent>
<artifactId>sample-consumer</artifactId>
</parent>
<artifactId>sample-consumer</artifactId>
- <version>0.
0.3
-SNAPSHOT</version>
+ <version>0.
5.0
-SNAPSHOT</version>
<packaging>bundle</packaging>
<packaging>bundle</packaging>
- <properties>
- <yang.prototype.version>1.0</yang.prototype.version>
- </properties>
-
-
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.6</version>
<extensions>true</extensions>
<configuration>
<instructions>
<extensions>true</extensions>
<configuration>
<instructions>
@@
-40,16
+34,16
@@
</build>
<dependencies>
<dependency>
</build>
<dependencies>
<dependency>
+ <groupId>org.opendaylight.openflowplugin.model</groupId>
<artifactId>model-flow-base</artifactId>
<artifactId>model-flow-base</artifactId>
- <groupId>org.opendaylight.controller.model</groupId>
</dependency>
<dependency>
</dependency>
<dependency>
+ <groupId>org.opendaylight.openflowplugin.model</groupId>
<artifactId>model-flow-service</artifactId>
<artifactId>model-flow-service</artifactId>
- <groupId>org.opendaylight.controller.model</groupId>
</dependency>
<dependency>
</dependency>
<dependency>
+ <groupId>org.opendaylight.openflowplugin.model</groupId>
<artifactId>model-flow-statistics</artifactId>
<artifactId>model-flow-statistics</artifactId>
- <groupId>org.opendaylight.controller.model</groupId>
</dependency>
<dependency>
<artifactId>model-inventory</artifactId>
</dependency>
<dependency>
<artifactId>model-inventory</artifactId>
@@
-60,9
+54,8
@@
<artifactId>sal-binding-api</artifactId>
</dependency>
<dependency>
<artifactId>sal-binding-api</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.
yangtools
</groupId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
<artifactId>yang-binding</artifactId>
<artifactId>yang-binding</artifactId>
- <version>0.6.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@
-76,7
+69,6
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
- <version>${yang.prototype.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>