Align odl-jolokia-osgi version with project

[controller.git] / artifacts / pom.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 0dcc60fdb72fa33a4e4a48e9a8051debce1f64b1..2dbe3ceeac82308c26aff22d275c8fa614fc858d 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -52,15 +52,6 @@
                 <scope>test</scope>
             </dependency>
 
-            <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>
@@ -212,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>
@@ -272,7 +270,15 @@
                 <classifier>datastore</classifier>
             </dependency>
 
-            <!-- Features -->
+            <!-- Production Features -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-controller</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <scope>runtime</scope>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-broker</artifactId>
@@ -324,29 +330,29 @@
             </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>
-                <version>${project.version}</version>
+                <artifactId>odl-jolokia</artifactId>
+                <version>1.15.0-SNAPSHOT</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
@@ -443,7 +449,7 @@
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-controller-exp-netty-config</artifactId>
-                <version>0.13.0-SNAPSHOT</version>
+                <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>