Code Review
/
netvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-1173: do not mention guava.version"
[netvirt.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
old mode 100755
(executable)
new mode 100644
(file)
index
46039dd
..
468633c
--- a/
pom.xml
+++ b/
pom.xml
@@
-5,12
+5,13
@@
<parent>
<groupId>org.opendaylight.ovsdb</groupId>
<artifactId>commons</artifactId>
<parent>
<groupId>org.opendaylight.ovsdb</groupId>
<artifactId>commons</artifactId>
- <version>1.
2
.0-SNAPSHOT</version>
+ <version>1.
3
.0-SNAPSHOT</version>
<relativePath>commons/parent</relativePath>
</parent>
<artifactId>ovsdb</artifactId>
<relativePath>commons/parent</relativePath>
</parent>
<artifactId>ovsdb</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
+ <name>ovsdb</name> <!-- Used by Sonar to set project name -->
<packaging>pom</packaging>
<prerequisites>
<packaging>pom</packaging>
<prerequisites>
@@
-29,18
+30,21
@@
<module>plugin-shell</module>
<module>plugin-mdsal-adapter</module>
<module>northbound</module>
<module>plugin-shell</module>
<module>plugin-mdsal-adapter</module>
<module>northbound</module>
+ <module>utils/config</module>
<module>utils/mdsal-openflow</module>
<module>openstack/net-virt</module>
<module>openstack/net-virt-providers</module>
<module>utils/mdsal-openflow</module>
<module>openstack/net-virt</module>
<module>openstack/net-virt-providers</module>
- <module>of-extension/nx-ofjava</module>
- <module>of-extension/nx-sal</module>
<module>ovs-sfc</module>
<module>ovs-sfc</module>
+ <module>southbound</module>
<!-- Integration Tests -->
<module>integrationtest</module>
<!-- Integration Tests -->
<module>integrationtest</module>
+ <!-- Config Files -->
<!-- Karaf Distribution -->
<!-- Karaf Distribution -->
- <module>features</module>
+ <module>features/ovsdb</module>
+ <module>features/ovs-sfc</module>
<!-- OVSDB Distribution -->
<module>distribution/opendaylight</module>
<!-- OVSDB Distribution -->
<module>distribution/opendaylight</module>
+ <module>distribution/opendaylight-karaf</module>
</modules>
<scm>
</modules>
<scm>
@@
-49,5
+53,5
@@
<tag>HEAD</tag>
<url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
</scm>
<tag>HEAD</tag>
<url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
</scm>
-
+
</project>
</project>