X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=artifacts%2Fpom.xml;h=620476d498c854921409b6a5b1a49d324b9bf994;hp=3df1dd55a2c0e09679ca356cb41798e724f99be8;hb=6481a3188fb6a6027f088aa4d2d8834007505ff7;hpb=d2c2643ec42e1bf3d23b47d2407cceed9a40ba6a

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 3df1dd55a2..620476d498 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,17 +14,24 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.5</version>
+        <version>9.0.6</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>controller-artifacts</artifactId>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>4.0.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>
         <dependencies>
+            <!-- Repackaged Akka -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>repackaged-akka</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <!-- Core API/implementation -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -52,18 +59,6 @@
                 <scope>test</scope>
             </dependency>
 
-            <!-- Base model augmentations -->
-            <dependency>
-                <groupId>org.opendaylight.controller.model</groupId>
-                <artifactId>model-inventory</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller.model</groupId>
-                <artifactId>model-topology</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <!-- Clustered implementation -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -87,11 +82,6 @@
                 <artifactId>sal-distributed-datastore</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-distributed-eos</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>sal-remoterpc-connector</artifactId>
@@ -151,6 +141,16 @@
                 <artifactId>cds-dom-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>cds-mgmt-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>eos-dom-akka</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- Toaster -->
             <dependency>
@@ -182,35 +182,6 @@
                 <scope>runtime</scope>
             </dependency>
 
-            <!-- MessageBus -->
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>messagebus-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-controller-exp-messagebus</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-
             <!-- Clustering system test support -->
             <dependency>
                 <groupId>org.opendaylight.controller.samples</groupId>
@@ -227,6 +198,11 @@
                 <artifactId>clustering-it-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller.samples</groupId>
+                <artifactId>clustering-it-karaf-cli</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- Config files -->
             <dependency>
@@ -280,63 +256,63 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-broker</artifactId>
+                <artifactId>odl-controller-akka</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-broker-local</artifactId>
+                <artifactId>odl-controller-scala</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-clustering-commons</artifactId>
+                <artifactId>odl-mdsal-broker</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-controller-mdsal-common</artifactId>
+                <artifactId>odl-controller-broker-local</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-controller-blueprint</artifactId>
+                <artifactId>odl-mdsal-clustering-commons</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-distributed-datastore</artifactId>
+                <artifactId>odl-controller-mdsal-common</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-remoterpc-connector</artifactId>
+                <artifactId>odl-controller-blueprint</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-model-inventory</artifactId>
+                <artifactId>odl-mdsal-distributed-datastore</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-controller-model-topology</artifactId>
+                <artifactId>odl-mdsal-remoterpc-connector</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
@@ -414,27 +390,27 @@
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netty-event-executor-config</artifactId>
-                <version>0.13.3-SNAPSHOT</version>
+                <version>0.15.4-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netty-threadgroup-config</artifactId>
-                <version>0.13.3-SNAPSHOT</version>
+                <version>0.15.4-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netty-timer-config</artifactId>
-                <version>0.13.3-SNAPSHOT</version>
+                <version>0.15.4-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>threadpool-config-api</artifactId>
-                <version>0.13.3-SNAPSHOT</version>
+                <version>0.15.4-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>threadpool-config-impl</artifactId>
-                <version>0.13.3-SNAPSHOT</version>
+                <version>0.15.4-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>