X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fpom.xml;h=ceba4f18dbd3ec75b2d057f7f5fe98d77299c5b5;hp=8ef179898b3a476e8adb23fa20def6dcaf54a3cd;hb=47f9449f977820bc605bafa23e81ee2efe6d9f37;hpb=58393ca23932b49ce5ba2fa3c23822490d0494b5

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 8ef179898b..ceba4f18db 100644
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -3,14 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>commons.opendaylight</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-    <relativePath>../commons/opendaylight</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>2.0.2</version>
+    <relativePath/>
   </parent>
 
+  <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-parent</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -20,6 +21,7 @@
     <module>sal-common-api</module>
     <module>sal-common-impl</module>
     <module>sal-common-util</module>
+    <module>sal-common-testutil</module>
 
     <!-- Binding Independent -->
     <module>sal-dom-api</module>
@@ -44,9 +46,6 @@
     <!-- Samples -->
     <module>samples</module>
 
-    <!-- Base Models -->
-    <module>sal-remote</module>
-
     <!-- Connectors -->
     <module>sal-connector-api</module>
 
@@ -58,6 +57,8 @@
 
     <module>sal-clustering-commons</module>
     <module>cds-access-api</module>
+    <module>cds-access-client</module>
+    <module>cds-dom-api</module>
 
     <!-- sal clustering configuration -->
     <module>sal-clustering-config</module>
@@ -65,12 +66,8 @@
     <!-- 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>
-    <module>sal-karaf-xsql</module>
-    <module>sal-dom-xsql-config</module>
+    <module>sal-cluster-admin-api</module>
+    <module>sal-cluster-admin-impl</module>
 
     <!-- Yang Test Models for MD-SAL -->
     <module>sal-test-model</module>
@@ -93,118 +90,11 @@
     <module>mdsal-it-base</module>
     <module>mdsal-it-parent</module>
 
+    <!-- Debug utils -->
+    <module>mdsal-trace</module>
+
   </modules>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>${bundle.plugin.version}</version>
-          <extensions>true</extensions>
-          <!--executions> <execution> <id>bundle-manifest</id>
-                        <phase>process-classes</phase> <goals> <goal>manifest</goal> </goals> </execution>
-                        </executions -->
-          <configuration>
-            <instructions>
-              <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-            </instructions>
-            <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-          </configuration>
-        </plugin>
-        <!--This plugin's configuration is used to store Eclipse
-                    m2e settings only. It has no influence on the Maven build itself. -->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>${lifecycle.mapping.version}</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>net.alchim31.maven</groupId>
-                    <artifactId>scala-maven-plugin</artifactId>
-                    <versionRange>[0,)</versionRange>
-                    <goals>
-                      <goal>compile</goal>
-                      <goal>testCompile</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore/>
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <versionRange>[0,)</versionRange>
-                    <goals>
-                      <goal>prepare-agent</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <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>
-      </plugins>
-
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>yang-jmx-generator-plugin</artifactId>
-            <version>${config.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>${findbugs.maven.plugin.version}</version>
-        <configuration>
-          <effort>Max</effort>
-          <threshold>Low</threshold>
-          <goal>site</goal>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>