X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fpom.xml;h=489ec7bdc3997d636289f288b3010892cc432476;hb=38402d3e9b8976a40d7926efe47a06243210562f;hp=5328438b8a5e3106c64807dac70d7ca8f8d515b5;hpb=5197d588dac65f2345cbcba2e5aefae308fcf3a0;p=controller.git

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 5328438b8a..489ec7bdc3 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.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath>../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>sal-parent</artifactId>
-  <version>1.3.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,19 +44,10 @@
     <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>
@@ -61,8 +55,8 @@
     <!--InMemory DOM DataStore-->
     <module>sal-inmemory-datastore</module>
 
-    <!--sal-protocolbuffer-encoding is now part of sal-clutering-commons-->
     <module>sal-clustering-commons</module>
+    <module>cds-access-api</module>
 
     <!-- sal clustering configuration -->
     <module>sal-clustering-config</module>
@@ -70,6 +64,7 @@
     <!-- sal-distributed-datastore -->
     <module>sal-distributed-datastore</module>
     <module>sal-dummy-distributed-datastore</module>
+    <module>sal-cluster-admin</module>
 
     <!-- XSQL -->
     <module>sal-dom-xsql</module>
@@ -86,7 +81,17 @@
     <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>
@@ -160,11 +165,6 @@
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <version>${jacoco.version}</version>
-        </plugin>
       </plugins>
 
     </pluginManagement>
@@ -202,11 +202,6 @@
           <goal>site</goal>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jdepend-maven-plugin</artifactId>
-        <version>${jdepend.maven.plugin.version}</version>
-      </plugin>
     </plugins>
   </reporting>
   <scm>
@@ -217,16 +212,6 @@
   </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>