Use karaf-maven-plugin 4.1.5

[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 a54979af8978392ba7921e7514be60c46ed94393..9c3361c3b5ed4841c5d9986fa8abd87040af5c0e 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -58,13 +58,27 @@
             <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>
-                <activeByDefault>true</activeByDefault>
+                <!-- Removed because restconf-bierman issue -->
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -427,8 +441,7 @@
         <profile>
             <id>tsdr</id>
             <activation>
-                <!-- Removed because tsdr is not using latest netty version -->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>