X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fsingles%2Fodl-integration-compatible-with-all%2Fpom.xml;h=77fdb57e63233cc2c0660c31cf0aba287c6bb737;hb=e638a3874673c663a775d5f0c14d6733765f4336;hp=631dc75b06f4bee10fe63657fb53dde5154bee1c;hpb=c4ee0656d3bc65be85d8d8a709b9a089f6facf3d;p=integration%2Fdistribution.git

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 631dc75b..77fdb57e 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -11,13 +11,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>odl-integration-compatible-with-all</artifactId>
     <!-- TODO: Shorter name? -->
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.13.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,18 +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>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <version>4.1.5</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <!-- User facing single features. Alphabetical order -->
     <profiles>
         <!-- AAA -->
@@ -126,16 +114,16 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- InfraUtils -->
+        <!-- jsonrpc -->
         <profile>
-            <id>infrautils</id>
+            <id>jsonrpc</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.opendaylight.infrautils</groupId>
-                    <artifactId>odl-infrautils-ready</artifactId>
+                    <groupId>org.opendaylight.jsonrpc</groupId>
+                    <artifactId>odl-jsonrpc-all</artifactId>
                     <type>xml</type>
                     <classifier>features</classifier>
                 </dependency>
@@ -246,38 +234,5 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- SFC -->
-        <profile>
-            <id>sfc</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-ovs</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-sb-rest</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfclisp</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.sfc</groupId>
-                    <artifactId>odl-sfc-shell</artifactId>
-                    <type>xml</type>
-                    <classifier>features</classifier>
-                </dependency>
-            </dependencies>
-        </profile>
     </profiles>
 </project>