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)

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 32fdfd5403c55c3f7b588e90c5d5fd16c5c766a6..fe021021b39a458a83683ec542d72c3d1626b223 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 42e9455d24261c6ffdf93cd06b685dd379326d46..27c14b1fddc22711015ee2b0a41aed79a3e10afb 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 555a5aad9c46c1c433d63b264e00e248f0b387f3..f7e99ac6bd4ece7e111ac3bcedf225a924f1db7b 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 631dc75b06f4bee10fe63657fb53dde5154bee1c..2bbe3ecdb46f6ec7a0cb6501130c6b0c9f3039bc 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 -->