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 "Bug 2983: Added support for creation of multiple list entries"
[controller.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index 1217d720663706fd12f4117a124a86d66d7dd8a7..bde0e73a20eb6b07627ffebc9f46d10b4e070a02 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-4,18
+4,15
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.parent</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.parent</artifactId>
- <version>1.
1
.0-SNAPSHOT</version>
+ <version>1.
2
.0-SNAPSHOT</version>
<relativePath>opendaylight/commons/parent</relativePath>
</parent>
<artifactId>releasepom</artifactId>
<relativePath>opendaylight/commons/parent</relativePath>
</parent>
<artifactId>releasepom</artifactId>
- <version>0.
2
.0-SNAPSHOT</version>
+ <version>0.
3
.0-SNAPSHOT</version>
<packaging>pom</packaging>
<packaging>pom</packaging>
- <name>controller</name> <!-- Used by Sonar to set project name -->
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
+ <name>controller</name>
+ <!-- Used by Sonar to set project name -->
<modules>
<modules>
@@
-29,11
+26,6
@@
<!-- adsal -->
<module>opendaylight/adsal</module>
<!-- adsal -->
<module>opendaylight/adsal</module>
- <!-- Neutron -->
- <module>opendaylight/networkconfiguration/neutron</module>
- <module>opendaylight/networkconfiguration/neutron/implementation</module>
- <module>opendaylight/networkconfiguration/neutron/northbound</module>
-
<!-- Parents -->
<module>opendaylight/commons/concepts</module>
<module>opendaylight/commons/protocol-framework</module>
<!-- Parents -->
<module>opendaylight/commons/concepts</module>
<module>opendaylight/commons/protocol-framework</module>
@@
-43,6
+35,7
@@
<module>opendaylight/commons/logback_settings</module>
<module>opendaylight/commons/filter-valve</module>
<module>opendaylight/commons/liblldp</module>
<module>opendaylight/commons/logback_settings</module>
<module>opendaylight/commons/filter-valve</module>
<module>opendaylight/commons/liblldp</module>
+ <module>opendaylight/commons/enunciate-parent</module>
<!-- Karaf Distribution -->
<module>karaf</module>
<!-- Karaf Distribution -->
<module>karaf</module>