X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=artifacts%2Fpom.xml;h=83b1d775337c1348caa9879322666bc148f553b2;hp=8a009390f58330830b1625c30b0549575a712db6;hb=42ec9dc63df7cea0ae3a4d841aa14a21ba948859;hpb=7afa653090818a9fd80b6fd50fe005f6663fc177

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 8a009390f5..83b1d77533 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,13 +14,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>controller-artifacts</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>2.0.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>
@@ -52,16 +52,6 @@
                 <scope>test</scope>
             </dependency>
 
-            <!-- Features -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-mdsal</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-                <scope>runtime</scope>
-            </dependency>
-
             <!-- Base model augmentations -->
             <dependency>
                 <groupId>org.opendaylight.controller.model</groupId>
@@ -132,17 +122,17 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>cds-access-api</artifactId>
-                <version>1.8.0-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>cds-access-client</artifactId>
-                <version>1.8.0-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>cds-access-client</artifactId>
-                <version>1.8.0-SNAPSHOT</version>
+                <version>${project.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -159,7 +149,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>cds-dom-api</artifactId>
-                <version>1.8.0-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
 
             <!-- Toaster -->
@@ -213,6 +203,13 @@
                 <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>
@@ -231,7 +228,56 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- Features -->
+            <!-- Config files -->
+            <dependency>
+                <!-- finalname="configuration/initial/akka.conf" -->
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-clustering-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>akkaconf</classifier>
+            </dependency>
+            <dependency>
+                <!-- finalname="configuration/factory/akka.conf" override="true" -->
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-clustering-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>factoryakkaconf</classifier>
+            </dependency>
+            <dependency>
+                <!-- finalname="configuration/initial/module-shards.conf" -->
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-clustering-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>moduleshardconf</classifier>
+            </dependency>
+            <dependency>
+                <!-- finalname="configuration/initial/modules.conf" -->
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-clustering-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>moduleconf</classifier>
+            </dependency>
+            <dependency>
+                <!-- finalname="etc/org.opendaylight.controller.cluster.datastore.cfg" -->
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-clustering-config</artifactId>
+                <version>${project.version}</version>
+                <type>cfg</type>
+                <classifier>datastore</classifier>
+            </dependency>
+
+            <!-- Production Features -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-controller</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-broker</artifactId>
@@ -283,28 +329,44 @@
             </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-mdsal-model-inventory</artifactId>
+                <artifactId>odl-controller-model-topology</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-toaster</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-toaster</artifactId>
+                <artifactId>odl-jolokia</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+
+            <!-- CSIT and other testing Features -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-controller-testing</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-mdsal-benchmark</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
@@ -319,48 +381,67 @@
 
             <!-- Benchmarks -->
             <dependency>
-               <groupId>${project.groupId}</groupId>
+                <groupId>${project.groupId}</groupId>
                 <artifactId>benchmark-api</artifactId>
-                <version>1.10.0-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>dsbenchmark</artifactId>
-                <version>1.10.0-SNAPSHOT</version>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>ntfbenchmark</artifactId>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>benchmark-features</artifactId>
-                <version>1.10.0-SNAPSHOT</version>
+                <artifactId>rpcbenchmark</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <!-- Expertimental Features -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-controller-experimental</artifactId>
+                <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
 
             <!-- Config remnants -->
-             <dependency>
-                 <groupId>${project.groupId}</groupId>
-                 <artifactId>netty-event-executor-config</artifactId>
-                 <version>0.13.0-SNAPSHOT</version>
-             </dependency>
-             <dependency>
-                 <groupId>${project.groupId}</groupId>
-                 <artifactId>netty-threadgroup-config</artifactId>
-                 <version>0.13.0-SNAPSHOT</version>
-             </dependency>
-             <dependency>
-                 <groupId>${project.groupId}</groupId>
-                 <artifactId>netty-timer-config</artifactId>
-                 <version>0.13.0-SNAPSHOT</version>
-             </dependency>
-             <dependency>
-                 <groupId>${project.groupId}</groupId>
-                 <artifactId>threadpool-config-api</artifactId>
-                 <version>0.13.0-SNAPSHOT</version>
-             </dependency>
-             <dependency>
-                 <groupId>${project.groupId}</groupId>
-                 <artifactId>threadpool-config-impl</artifactId>
-                 <version>0.13.0-SNAPSHOT</version>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netty-event-executor-config</artifactId>
+                <version>0.13.4-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netty-threadgroup-config</artifactId>
+                <version>0.13.4-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netty-timer-config</artifactId>
+                <version>0.13.4-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>threadpool-config-api</artifactId>
+                <version>0.13.4-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>threadpool-config-impl</artifactId>
+                <version>0.13.4-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-controller-exp-netty-config</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
             </dependency>
         </dependencies>
     </dependencyManagement>