X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Frepos%2Findex%2Fpom.xml;h=c5f8e14634e968b13e82b6d358b1687e8372e042;hb=78aba105dfd9fd5aec3f7fb3088dcb3212aed274;hp=b0aa55982608aa4e5af7a6c42089f92bd5f59bcd;hpb=52f0c9b7b3891d947f2fdc482c087ee328ed8757;p=integration%2Fdistribution.git

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index b0aa5598..c5f8e146 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -12,12 +12,12 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>3.1.0</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>features-index</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.12.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
@@ -49,20 +49,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <!-- Override odlparent default to get the speed improvements in feature generation
-         FIXME: remove this once odlparent ships 4.1.5+ -->
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.karaf.tooling</groupId>
-                    <artifactId>karaf-maven-plugin</artifactId>
-                    <version>4.1.5</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <!-- User facing single features. Alphabetical order -->
     <!-- FIXME: How to explain to feature-repo-parent it shall not list single features from repo dependencies? -->
     <profiles>
@@ -213,6 +199,21 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- jsonrpc -->
+        <profile>
+            <id>jsonrpc</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.jsonrpc</groupId>
+                    <artifactId>features-jsonrpc</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- LISP Flow Mapping -->
         <profile>
             <id>lispflowmapping</id>
@@ -299,12 +300,6 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.odlparent</groupId>
-                    <artifactId>features-akka</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
                 <dependency>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>features-odlparent</artifactId>
@@ -365,7 +360,7 @@
         <profile>
             <id>serviceutils</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>