Merge "Bring some reliability in the eclipse and maven mixed builds"

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

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 1ea922e07e968035186f14a1627c257136f3316c..3f27ff1055882d1352e27f7208d4571919f06e71 100755 (executable)
--- 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>
@@ -25,12 +25,28 @@
         <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-store-api</module>
         <module>yang-store-impl</module>
         <module>yang-test</module>
         <module>logback-config</module>
+        <module>threadpool-config-api</module>
+        <module>threadpool-config-impl</module>
+        <module>netty-threadgroup-config</module>
+        <module>netty-event-executor-config</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>
@@ -43,6 +59,7 @@
         <jolokia.version>1.1.1</jolokia.version>
         <opendaylight.yang.version>0.5.9-SNAPSHOT</opendaylight.yang.version>
         <opendaylight.binding.version>0.6.0-SNAPSHOT</opendaylight.binding.version>
+        <opendaylight.yangtools.version>0.1.1-SNAPSHOT</opendaylight.yangtools.version>
         <jmxGeneratorPath>${project.build.directory}/generated-sources/config</jmxGeneratorPath>
     </properties>
 
@@ -212,13 +229,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
-                <configuration>
-                    <source>${java.version.source}</source>
-                    <target>${java.version.target}</target>
-                    <testSource>${java.version.source}</testSource>
-                    <testTarget>${java.version.target}</testTarget>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
@@ -399,27 +409,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>nexus.opendaylight.org</id>
-            <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <repositories>
-        <repository>
-            <id>opendaylight-snapshot</id>
-            <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot</url>
-            <snapshots>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-        </repository>
-    </repositories>
 </project>