Use karaf-maven-plugin 4.1.5

A couple of generated features are taking ~10 minutes to build. This
is somewhat mitigated by the patch for KARAF-5604, which ships in 4.1.5.

Change-Id: I7a4a16f950935701d5c682b9792af0ede0ba64a3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 61ac4c53acb5e5110547864a3829dc6e6f46e6ca..6b3cdae0cb7cc9adcb4ffd2d3ec90e6d3322990d 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -50,6 +50,21 @@
             </dependency>
         </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>

diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index 79319e52cd9c5db33f88e89f314351ed439629c6..6ce1037abc1ad34a2c841588020feec32a47cd1d 100644 (file)
--- a/features/repos/test/pom.xml
+++ b/features/repos/test/pom.xml
@@ -50,6 +50,21 @@
             </dependency>
         </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>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index d413481b4dfebd39ce040b0468583e9e9bc11f84..9c3361c3b5ed4841c5d9986fa8abd87040af5c0e 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -58,6 +58,19 @@
             <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 -->

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 568c0975b9306a7c1447e4817e8f2c3ab4fc6cf7..5b5c4004b7896d701ed8f4a560c02be9773649ee 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -50,6 +50,19 @@
             </dependency>
         </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 -->