X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fpom.xml;h=f1de8e07628696e7f3688c4af4dba1efd8d98759;hp=eca5213905ada8dd8f96dbed7232fb22adde38d3;hb=70a1d4634bd92bf970077e269dc4433d1719f6fb;hpb=5cd6ac6819a1dcbab05c6ffbc3ac427ea41c658d

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index eca5213905..f1de8e0762 100644
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -5,19 +5,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath>../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>sal-parent</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
     <module>mdsal-artifacts</module>
 
     <!-- Common APIs & Implementation -->
-    <module>sal-common</module>
     <module>sal-common-api</module>
     <module>sal-common-impl</module>
     <module>sal-common-util</module>
@@ -29,11 +28,15 @@
 
     <!-- Binding Aware -->
     <module>sal-binding-api</module>
-    <module>sal-binding-config</module>
     <module>sal-binding-broker</module>
 
     <module>sal-binding-util</module>
 
+    <!-- Config subsystem bindings -->
+    <module>sal-dom-config</module>
+    <module>sal-dom-broker-config</module>
+    <module>sal-binding-config</module>
+
     <!-- Configuration File -->
     <module>md-sal-config</module>
 
@@ -41,21 +44,13 @@
     <module>samples</module>
 
     <!-- Base Models -->
-    <module>model</module>
     <module>sal-remote</module>
-    <module>sal-restconf-broker</module>
 
     <!-- Connectors -->
     <module>sal-connector-api</module>
-    <module>sal-rest-connector</module>
-    <module>sal-rest-connector-config</module>
-    <module>sal-netconf-connector</module>
-
-    <!-- Documentation -->
-    <module>sal-rest-docgen</module>
-    <module>sal-rest-docgen-maven</module>
 
     <module>sal-akka-raft</module>
+    <module>sal-akka-raft-example</module>
 
     <!--InMemory DOM DataStore-->
     <module>sal-inmemory-datastore</module>
@@ -83,7 +78,19 @@
 
     <!-- Message Bus -->
     <module>messagebus-api</module>
+    <module>messagebus-spi</module>
     <module>messagebus-impl</module>
+    <module>messagebus-util</module>
+    <module>messagebus-config</module>
+
+    <!-- PAX EXAM ITs -->
+    <module>sal-binding-it</module>
+    <module>sal-binding-dom-it</module>
+
+    <!-- IT Base and Parent -->
+    <module>mdsal-it-base</module>
+    <module>mdsal-it-parent</module>
+
   </modules>
 
   <build>
@@ -150,18 +157,13 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <execute></execute>
+                    <execute/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <version>${jacoco.version}</version>
-        </plugin>
       </plugins>
 
     </pluginManagement>
@@ -207,23 +209,13 @@
     </plugins>
   </reporting>
   <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
   </scm>
 
   <profiles>
-    <profile>
-      <id>integrationtests</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <modules>
-        <module>sal-binding-it</module>
-        <module>sal-binding-dom-it</module>
-      </modules>
-    </profile>
     <profile>
       <id>benchmarks</id>
       <activation>