X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fmdsal-artifacts%2Fpom.xml;h=cd2106633a982dfed11ce67556bc2f1823b2c641;hp=a1a12804c0e73c89f70889bb029c3df3ee9184b7;hb=refs%2Fchanges%2F76%2F69876%2F11;hpb=dda9417cc726c39a79b53f497df82ff379a2a2d5

diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index a1a12804c0..cd2106633a 100644
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -12,15 +12,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-		<groupId>org.opendaylight.odlparent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>1.8.0-SNAPSHOT</version>
-		<relativePath/>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>3.1.0</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-artifacts</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>
@@ -106,6 +106,21 @@
                 <artifactId>sal-schema-service</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mdsal-trace-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mdsal-trace-dom-impl</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mdsal-trace-binding-impl</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- Test support -->
             <dependency>
@@ -206,59 +221,34 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>cds-access-api</artifactId>
-                <version>1.1.0-SNAPSHOT</version>
+                <version>1.4.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>cds-access-client</artifactId>
-                <version>1.1.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-cluster-admin-api</artifactId>
-                <version>${project.version}</version>
+                <version>1.4.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-cluster-admin-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>cds-dom-api</artifactId>
-                <version>1.1.0-SNAPSHOT</version>
-            </dependency>
-
-            <!-- RESTCONF -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-remote</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-rest-connector</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-rest-connector-config</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cds-access-client</artifactId>
+                <version>1.4.0-SNAPSHOT</version>
+                <type>test-jar</type>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-restconf-broker</artifactId>
+                <artifactId>sal-cluster-admin-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-rest-docgen</artifactId>
+                <artifactId>sal-cluster-admin-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-rest-docgen-maven</artifactId>
-                <version>${project.version}</version>
+                <artifactId>cds-dom-api</artifactId>
+                <version>1.4.0-SNAPSHOT</version>
             </dependency>
 
             <!-- Toaster -->
@@ -291,44 +281,42 @@
                 <scope>runtime</scope>
             </dependency>
 
-            <!-- XSQL support -->
+            <!-- MessageBus -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-dom-xsql</artifactId>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>messagebus-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-karaf-xsql</artifactId>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>messagebus-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-dom-xsql-config</artifactId>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>messagebus-impl</artifactId>
                 <version>${project.version}</version>
-                <classifier>config</classifier>
-                <type>xml</type>
             </dependency>
-
-            <!-- MessageBus -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-api</artifactId>
+                <artifactId>messagebus-util</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
+            <!-- Clustering system test support -->
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-spi</artifactId>
+                <groupId>org.opendaylight.controller.samples</groupId>
+                <artifactId>clustering-it-config</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-impl</artifactId>
+                <groupId>org.opendaylight.controller.samples</groupId>
+                <artifactId>clustering-it-model</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-util</artifactId>
+                <groupId>org.opendaylight.controller.samples</groupId>
+                <artifactId>clustering-it-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
@@ -363,7 +351,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-common</artifactId>
+                <artifactId>odl-controller-mdsal-common</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
@@ -384,14 +372,21 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-xsql</artifactId>
+                <artifactId>odl-message-bus-collector</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-message-bus-collector</artifactId>
+                <artifactId>odl-mdsal-model-inventory</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-controller-model-topology</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
@@ -403,6 +398,13 @@
                 <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>
     </dependencyManagement>