Merge "Bug 509: Added In-memory datastore support for wildcarded change listeners"

[controller.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 6ece420d5ad01e252c431fd7a4ab38f2240dcd3c..446c90048eaabcf28d1855b5756c62947f14f785 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,16 +13,14 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
     <relativePath>opendaylight/commons/parent</relativePath>
   </parent>
-
   <artifactId>releasepom</artifactId>
-  <version>0.1.1-SNAPSHOT</version>
+  <version>0.1.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>opendaylight/distribution/opendaylight</module>
-    <module>opendaylight/archetypes</module>
     <module>opendaylight/forwarding/staticrouting</module>
     <module>opendaylight/clustering/services</module>
     <module>opendaylight/clustering/services_implementation</module>
@@ -57,7 +55,7 @@
     <!-- <module>third-party/net.sf.jung2</module> -->
     <!-- <module>third-party/jersey-servlet</module> -->
     <!-- <module>third-party/org.apache.catalina.filters.CorsFilter</module> -->
-    <!-- <module>third-party/ganymed</module> -->
+    <module>third-party/ganymed</module>
 
     <module>third-party/commons/thirdparty</module>
 
@@ -124,12 +122,12 @@
 
     <!-- Parents -->
     <module>opendaylight/commons/concepts</module>
+    <module>opendaylight/commons/protocol-framework</module>
     <module>opendaylight/commons/httpclient</module>
     <module>opendaylight/commons/checkstyle</module>
     <module>opendaylight/commons/opendaylight</module>
     <module>opendaylight/commons/parent</module>
     <module>opendaylight/commons/logback_settings</module>
-    <module>opendaylight/commons/controller-maven-plugin</module>
   </modules>
 
     <profiles>
@@ -150,6 +148,7 @@
                 <module>opendaylight/statisticsmanager/integrationtest</module>
                 <module>opendaylight/commons/integrationtest</module>
                 <module>opendaylight/containermanager/it.implementation</module>
+                <module>opendaylight/distribution/sanitytest/</module>
             </modules>
         </profile>
         <profile>