From: Olivier Lamy <olamy@apache.org>
Date: Thu, 12 Feb 2015 10:58:28 +0000 (+1100)
Subject: inherit from parent pom
X-Git-Tag: archiva-2.2.0~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0b22f0e1f8e66a756c92a2d86b5c09c5eb7cb822;p=archiva.git

inherit from parent pom
---

diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 3e8e9b3b4..e729854af 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -94,7 +94,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -127,7 +126,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
         <configuration>
           <archive>
             <manifest>
diff --git a/archiva-modules/archiva-karaf/archiva-features/pom.xml b/archiva-modules/archiva-karaf/archiva-features/pom.xml
index 68fb6f6b1..e8faf8848 100644
--- a/archiva-modules/archiva-karaf/archiva-features/pom.xml
+++ b/archiva-modules/archiva-karaf/archiva-features/pom.xml
@@ -136,7 +136,7 @@
           <plugin>
             <groupId>org.apache.karaf.tooling</groupId>
             <artifactId>features-maven-plugin</artifactId>
-            <version>2.2.4</version>
+            <version>2.4.1</version>
             <configuration>
               <file>${project.build.directory}/classes/features.xml</file>
               <karafConfig>${project.build.directory}/classes/config.properties</karafConfig>
diff --git a/pom.xml b/pom.xml
index 01db89b6a..84c0f91e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1818,15 +1818,9 @@
             </dependency>
           </dependencies>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.7</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.5</version>
           <configuration>
             <localCheckout>true</localCheckout>
             <useReleaseProfile>false</useReleaseProfile>