Remove karaf plugin overrides

As per the FIXME, this removes the overrides.

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

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index ab33ba9f3780ff895c673c892cb1b8bcda4b8100..5e55a0d397b44b6670772d81e41f97c41dd9adde 100644 (file)
--- 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 87450767899f7ea0567e4b64fc2ae22035e2e1ff..6abd0ec10e700fd294a169eb8179d20cbe118778 100644 (file)
--- 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 8c01c6ce5cfc256779e9d7dca855cd848f5659db..c53b20bc74e17879d6f64aed3f2e0a054bd7a53c 100644 (file)
--- 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 5a89ccee8094bcd4e7eacdb54c2e25049382b28d..9abc2a3e27dec80a0bd8c7a260fce5d446e7973c 100644 (file)
--- 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 -->