Merge changes Ia268965a,Iefa79f99

[controller.git] / opendaylight / config / pom.xml

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
old mode 100755 (executable)
new mode 100644 (file)
index 9a0c881..c1eef70
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
 
-    <version>0.2.2-SNAPSHOT</version>
+    <version>0.2.3-SNAPSHOT</version>
     <artifactId>config-subsystem</artifactId>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
@@ -24,13 +24,32 @@
         <module>config-persister-api</module>
         <module>config-persister-file-adapter</module>
         <module>yang-jmx-generator</module>
-        <!-- <module>yang-jmx-generator-plugin</module> -->
-        <module>yang-jmx-generator-it</module>
+        <module>yang-jmx-generator-plugin</module>
         <module>yang-store-api</module>
         <module>yang-store-impl</module>
         <module>yang-test</module>
         <module>logback-config</module>
+        <module>threadpool-config-api</module>
+        <module>netty-config-api</module>
+        <module>threadpool-config-impl</module>
+        <module>netty-threadgroup-config</module>
+        <module>netty-event-executor-config</module>
+        <module>netty-timer-config</module>
+        <module>config-persister-directory-adapter</module>
     </modules>
+
+    <profiles>
+      <profile>
+        <id>integrationtests</id>
+        <activation>
+          <activeByDefault>false</activeByDefault>
+        </activation>
+        <modules>
+          <module>yang-jmx-generator-it</module>
+        </modules>
+      </profile>
+    </profiles>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version.source>1.7</java.version.source>