X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fpom.xml;h=cadd8ca87d784095c9a9a6bc5f08b396f399691d;hb=d207a2f677545357095f2e5f145a5ecc8d3a60dd;hp=8d4901d31b118659980148a20f79c0826b71a171;hpb=f6609a5ab258b69a0d8ae2a97ee140b4da3b82ba;p=controller.git

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 8d4901d31b..234dcfeb74 100644
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -5,17 +5,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>sal-parent</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.3.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>
@@ -27,41 +28,68 @@
 
     <!-- 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>
+
     <!-- Samples -->
     <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-netconf-connector</module>
 
-    <module>inventory-manager</module>
-    <module>statistics-manager</module>
-    <module>topology-manager</module>
-    <module>forwardingrules-manager</module>
-    <module>topology-lldp-discovery</module>
+    <module>sal-akka-raft</module>
+    <module>sal-akka-raft-example</module>
+
+    <!--InMemory DOM DataStore-->
+    <module>sal-inmemory-datastore</module>
 
-    <!-- Compability Packages -->
-    <module>compatibility</module>
+    <!--sal-protocolbuffer-encoding is now part of sal-clutering-commons-->
+    <module>sal-clustering-commons</module>
+
+    <!-- sal clustering configuration -->
+    <module>sal-clustering-config</module>
+
+    <!-- sal-distributed-datastore -->
+    <module>sal-distributed-datastore</module>
+    <module>sal-dummy-distributed-datastore</module>
+
+    <!-- XSQL -->
+    <module>sal-dom-xsql</module>
+    <module>sal-karaf-xsql</module>
+    <module>sal-dom-xsql-config</module>
+
+    <!-- Yang Test Models for MD-SAL -->
+    <module>sal-test-model</module>
 
     <!-- Clustering -->
-    <module>remoterpc-routingtable/implementation</module>
-    <module>sal-remoterpc-connector/implementation</module>
-    <!-- Documentation -->
-    <module>sal-rest-docgen</module>
+    <module>sal-remoterpc-connector</module>
+
+    <!-- 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>
 
-    <!--  Karaf feature -->
-    <module>feature</module>
+    <!-- IT Base and Parent -->
+    <module>mdsal-it-base</module>
+    <module>mdsal-it-parent</module>
 
   </modules>
 
@@ -88,7 +116,7 @@
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
           <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
+          <version>${lifecycle.mapping.version}</version>
           <configuration>
             <lifecycleMappingMetadata>
               <pluginExecutions>
@@ -103,7 +131,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -116,23 +144,26 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>yang-maven-plugin</artifactId>
+                    <versionRange>[0.5,)</versionRange>
+                    <goals>
+                      <goal>generate-sources</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.eclipse.xtend</groupId>
-          <artifactId>xtend-maven-plugin</artifactId>
-          <version>${xtend.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <version>${jacoco.version}</version>
-        </plugin>
       </plugins>
 
     </pluginManagement>
@@ -163,7 +194,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.4.0</version>
+        <version>${findbugs.maven.plugin.version}</version>
         <configuration>
           <effort>Max</effort>
           <threshold>Low</threshold>
@@ -173,12 +204,12 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jdepend-maven-plugin</artifactId>
-        <version>2.0-beta-2</version>
+        <version>${jdepend.maven.plugin.version}</version>
       </plugin>
     </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>
@@ -186,13 +217,12 @@
 
   <profiles>
     <profile>
-      <id>integrationtests</id>
+      <id>benchmarks</id>
       <activation>
         <activeByDefault>false</activeByDefault>
       </activation>
       <modules>
-        <module>sal-binding-it</module>
-        <module>sal-binding-dom-it</module>
+        <module>benchmark-data-store</module>
       </modules>
     </profile>
   </profiles>