From 3cd6a083665e3c1649a977495a3e18c7929ca1c8 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 12 Oct 2018 17:18:52 +0200
Subject: [PATCH] Remove karaf plugin overrides

As per the FIXME, this removes the overrides.

Change-Id: Ie1f51ba82776d1dee95f55dd60dc4e043db2df93
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 199d2ad453854403651af6f8e94ce280d69b459a)
---
 features/repos/index/pom.xml                       | 14 --------------
 features/repos/test/pom.xml                        | 14 --------------
 features/singles/odl-integration-all/pom.xml       | 12 ------------
 .../odl-integration-compatible-with-all/pom.xml    | 12 ------------
 4 files changed, 52 deletions(-)

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 32fdfd54..fe021021 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -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>
diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index 42e9455d..27c14b1f 100644
--- a/features/repos/test/pom.xml
+++ b/features/repos/test/pom.xml
@@ -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>
-
     <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 555a5aad..f7e99ac6 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -57,18 +57,6 @@
         </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>
         <!-- COE -->
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 631dc75b..2bbe3ecd 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -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 -->
-- 
2.36.6