X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=artifacts%2Fpom.xml;h=3f5ad25af67dd141d693529a9dbc932468a2e467;hp=c4c02cf0bb01d63cd0f7eff2c50e66f3d38b0dec;hb=refs%2Fchanges%2F77%2F91277%2F8;hpb=da801b41103249f1f80a5e2dbf49bb9003b74eba

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index c4c02cf0bb..3f5ad25af6 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.4</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>controller-artifacts</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>2.0.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>
@@ -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>
@@ -131,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>
@@ -158,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 -->
@@ -279,7 +270,14 @@
                 <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>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-broker</artifactId>
@@ -350,6 +348,13 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-jolokia</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
 
             <!-- CSIT and other testing Features -->
             <dependency>
@@ -358,7 +363,6 @@
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
-                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -379,29 +383,22 @@
             <dependency>
                 <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>1.10.0-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>rpcbenchmark</artifactId>
-                <version>1.10.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>odl-controller-test-benchmark</artifactId>
-                <version>1.10.0-SNAPSHOT</version>
-                <type>xml</type>
-                <classifier>features</classifier>
+                <version>${project.version}</version>
             </dependency>
 
             <!-- Expertimental Features -->
@@ -411,39 +408,38 @@
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
-                <scope>runtime</scope>
             </dependency>
 
             <!-- Config remnants -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netty-event-executor-config</artifactId>
-                <version>0.13.0-SNAPSHOT</version>
+                <version>0.13.3-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netty-threadgroup-config</artifactId>
-                <version>0.13.0-SNAPSHOT</version>
+                <version>0.13.3-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>netty-timer-config</artifactId>
-                <version>0.13.0-SNAPSHOT</version>
+                <version>0.13.3-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>threadpool-config-api</artifactId>
-                <version>0.13.0-SNAPSHOT</version>
+                <version>0.13.3-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>threadpool-config-impl</artifactId>
-                <version>0.13.0-SNAPSHOT</version>
+                <version>0.13.3-SNAPSHOT</version>
             </dependency>
             <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>