Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Do not override managed versions"
[controller.git]
/
opendaylight
/
arphandler
/
pom.xml
diff --git
a/opendaylight/arphandler/pom.xml
b/opendaylight/arphandler/pom.xml
index 8d62c1da4b1e53cabec2f0c2bc5acc0875a98660..ffd528beb0c161dfcf68c43ba5f82a9f83163e25 100644
(file)
--- a/
opendaylight/arphandler/pom.xml
+++ b/
opendaylight/arphandler/pom.xml
@@
-4,11
+4,11
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.
4.2
-SNAPSHOT</version>
+ <version>1.
5.0
-SNAPSHOT</version>
<relativePath>../commons/opendaylight</relativePath>
</parent>
<artifactId>arphandler</artifactId>
<relativePath>../commons/opendaylight</relativePath>
</parent>
<artifactId>arphandler</artifactId>
- <version>0.
5.2
-SNAPSHOT</version>
+ <version>0.
6.0
-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<packaging>bundle</packaging>
<dependencies>
<dependency>
@@
-50,7
+50,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>