From 63705aed8efe5f95ff2b2736fcd5d4b972b5b1e1 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Fri, 4 Mar 2016 12:55:06 +0100
Subject: [PATCH] Add controller features-extra repository to features-index

This is to make odl-jolokia feature available in system/ repository.

Change-Id: I56be90e1a553718e19e5aaaab6873edc591830e3
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 features-index/pom.xml                         | 11 +++++++++--
 features-index/src/main/resources/features.xml |  1 +
 pom.xml                                        |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/features-index/pom.xml b/features-index/pom.xml
index b70dc522..3129f0db 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -112,8 +112,8 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal-benchmark</artifactId>
-      <version>${feature.benchmark.version}</version>
+      <artifactId>features-extras</artifactId>
+      <version>${feature.controller.extras.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -124,6 +124,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-mdsal-benchmark</artifactId>
+      <version>${feature.benchmark.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.didm</groupId>
       <artifactId>features-didm</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 23dfb32a..0b52fb74 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -45,6 +45,7 @@
     <repository>mvn:org.opendaylight.bgpcep/features-rsvp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.capwap/capwap-features/${feature.capwap.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.centinel/centinel-features/${feature.centinel.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-extras/${feature.controller.extras.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal-benchmark/${feature.benchmark.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.didm/features-didm/${didm.version}/xml/features</repository>
diff --git a/pom.xml b/pom.xml
index 4edb5031..204521bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,7 @@
     <feature.capwap.version>0.3.0-SNAPSHOT</feature.capwap.version>
     <feature.centinel.version>0.2.0-SNAPSHOT</feature.centinel.version>
     <feature.circuitsw.version>1.1.0-SNAPSHOT</feature.circuitsw.version>
+    <feature.controller.extras.version>1.7.0-SNAPSHOT</feature.controller.extras.version>
     <feature.dlux.version>0.4.0-SNAPSHOT</feature.dlux.version>
     <feature.faas.version>1.1.0-SNAPSHOT</feature.faas.version>
     <feature.flow.version>1.4.0-SNAPSHOT</feature.flow.version>
-- 
2.36.6