Restore vtn to distribution

[integration/distribution.git] / features / singles / odl-integration-all / pom.xml

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 432fa468cdc47d60136e749798996242eb59f2c3..8ce5c479d83ea6a9d6283106c695ed5fb86f56a5 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -58,13 +58,26 @@
             <classifier>features</classifier>
         </dependency>
     </dependencies>
+
+    <!-- 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>
+
     <!-- External single feature dependencies in alphabetical order -->
     <profiles>
         <!-- BIER -->
         <profile>
             <id>bier</id>
             <activation>
-                <!-- Disabled due to failed merge job -->
+                <!-- Removed because restconf-bierman issue -->
                 <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
@@ -214,7 +227,7 @@
         <profile>
             <id>honeycombvbd</id>
             <activation>
-                <!-- netconf connector is broken after last bump migration -->
+                <!-- Commented out because of SFT memory problem -->
                 <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
@@ -238,6 +251,21 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- jsonrpc -->
+        <profile>
+            <id>jsonrpc</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.jsonrpc</groupId>
+                    <artifactId>jsonrpc-features</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- L2switch -->
         <profile>
             <id>l2switch</id>
@@ -296,8 +324,7 @@
         <profile>
             <id>netconf</id>
             <activation>
-                <!-- netconf connector is broken after last bump migration -->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -381,8 +408,7 @@
         <profile>
             <id>sfc</id>
             <activation>
-                <!-- netconf connector is broken after last bump migration -->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -461,8 +487,7 @@
         <profile>
             <id>vtn</id>
             <activation>
-                <!-- Removed for the odlparent 3 / yangtools 2 migration -->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>