X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fmdsal-artifacts%2Fpom.xml;h=08495bb0e4a9559fe0d2f5239b2c3269fa751b7d;hp=cfb1d2695435b129505ac2f2019367992b3d9c34;hb=c7515b27b065ef5f4d14ae931413ea83a4c047a8;hpb=477c26a243acacadcff6233bb3787662a3cd3e21

diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index cfb1d26954..08495bb0e4 100644
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -10,19 +10,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>3.1.2</version>
+        <relativePath/>
+    </parent>
+
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-artifacts</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>
         <dependencies>
             <!-- Core API/implementation -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-common</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>sal-common-api</artifactId>
@@ -48,6 +51,11 @@
                 <artifactId>sal-core-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-core-compat</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>sal-broker-impl</artifactId>
@@ -80,22 +88,17 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>sal-dom-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-dom-broker-config</artifactId>
+                <artifactId>mdsal-trace-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>sal-binding-config</artifactId>
+                <artifactId>mdsal-trace-dom-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>md-sal-config</artifactId>
+                <artifactId>mdsal-trace-binding-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
@@ -137,14 +140,13 @@
               <type>xml</type>
               <scope>runtime</scope>
             </dependency>
-
-            <!-- FIXME: These below need splitting up -->
-
-            <!-- AD-SAL compatibility -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-compatibility</artifactId>
-                <version>${project.version}</version>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>features-mdsal-trace</artifactId>
+              <version>${project.version}</version>
+              <classifier>features</classifier>
+              <type>xml</type>
+              <scope>runtime</scope>
             </dependency>
 
             <!-- Base model augmentations -->
@@ -165,6 +167,13 @@
                 <artifactId>sal-clustering-commons</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-clustering-commons</artifactId>
+                <version>${project.version}</version>
+                <type>test-jar</type>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>sal-clustering-config</artifactId>
@@ -197,150 +206,192 @@
                 <artifactId>sal-akka-raft-example</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
-            <!-- OpenFlow stuff -->
             <dependency>
-                <groupId>org.opendaylight.controller.md</groupId>
-                <artifactId>forwardingrules-manager</artifactId>
-                <version>${project.version}</version>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>cds-access-api</artifactId>
+                <version>1.4.0-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller.md</groupId>
-                <artifactId>inventory-manager</artifactId>
-                <version>${project.version}</version>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>cds-access-client</artifactId>
+                <version>1.4.0-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller.md</groupId>
-                <artifactId>statistics-manager</artifactId>
-                <version>${project.version}</version>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>cds-access-client</artifactId>
+                <version>1.4.0-SNAPSHOT</version>
+                <type>test-jar</type>
+                <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller.md</groupId>
-                <artifactId>topology-lldp-discovery</artifactId>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>sal-cluster-admin-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller.md</groupId>
-                <artifactId>topology-manager</artifactId>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>sal-cluster-admin-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller.model</groupId>
-                <artifactId>model-flow-base</artifactId>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>cds-dom-api</artifactId>
+                <version>1.4.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- Toaster -->
+            <dependency>
+                <groupId>org.opendaylight.controller.samples</groupId>
+                <artifactId>sample-toaster</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller.model</groupId>
-                <artifactId>model-flow-service</artifactId>
+                <groupId>org.opendaylight.controller.samples</groupId>
+                <artifactId>sample-toaster-consumer</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller.model</groupId>
-                <artifactId>model-flow-statistics</artifactId>
+                <groupId>org.opendaylight.controller.samples</groupId>
+                <artifactId>sample-toaster-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
-            <!-- RESTCONF -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-remote</artifactId>
+                <groupId>org.opendaylight.controller.samples</groupId>
+                <artifactId>toaster-config</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-rest-connector</artifactId>
+                <groupId>org.opendaylight.controller.samples</groupId>
+                <artifactId>features-toaster</artifactId>
                 <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <scope>runtime</scope>
             </dependency>
+
+            <!-- MessageBus -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-rest-connector-config</artifactId>
+                <artifactId>messagebus-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-restconf-broker</artifactId>
+                <artifactId>messagebus-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-rest-docgen</artifactId>
+                <artifactId>messagebus-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-rest-docgen-maven</artifactId>
+                <artifactId>messagebus-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- Toaster -->
+            <!-- Clustering system test support -->
             <dependency>
                 <groupId>org.opendaylight.controller.samples</groupId>
-                <artifactId>sample-toaster</artifactId>
+                <artifactId>clustering-it-config</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller.samples</groupId>
-                <artifactId>sample-toaster-consumer</artifactId>
+                <artifactId>clustering-it-model</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller.samples</groupId>
-                <artifactId>sample-toaster-provider</artifactId>
+                <artifactId>clustering-it-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
+            <!-- Features -->
             <dependency>
-                <groupId>org.opendaylight.controller.samples</groupId>
-                <artifactId>toaster-config</artifactId>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-mdsal-broker</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller.samples</groupId>
-                <artifactId>features-toaster</artifactId>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-mdsal-broker-local</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
                 <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-mdsal-clustering</artifactId>
+                <version>${project.version}</version>
                 <type>xml</type>
-                <scope>runtime</scope>
+                <classifier>features</classifier>
             </dependency>
-
-            <!-- XSQL support -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>sal-dom-xsql</artifactId>
+                <artifactId>odl-mdsal-clustering-commons</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>sal-karaf-xsql</artifactId>
+                <artifactId>odl-controller-mdsal-common</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>sal-dom-xsql-config</artifactId>
+                <artifactId>odl-mdsal-distributed-datastore</artifactId>
                 <version>${project.version}</version>
-                <classifier>config</classifier>
                 <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
-
-            <!-- MessageBus -->
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-api</artifactId>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-mdsal-remoterpc-connector</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-spi</artifactId>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-message-bus-collector</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-impl</artifactId>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-mdsal-model-inventory</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-util</artifactId>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-controller-model-topology</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-toaster</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-clustering-test-app</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
 
         </dependencies>