[maven] branch master updated: [MNG-6054] Remove super POM plugin management section

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new d2adab7  [MNG-6054] Remove super POM plugin management section
d2adab7 is described below

commit d2adab7bf3c2591c38adde729d11923d4c95052c
Author: Christian Schulte <schu...@apache.org>
AuthorDate: Sat Nov 12 20:20:11 2016 +0100

    [MNG-6054] Remove super POM plugin management section
    
    This closes #410
---
 .../apache/maven/project/PomConstructionTest.java  |  2 +-
 .../resources/org/apache/maven/model/pom-4.0.0.xml | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git 
a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java 
b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index 81ba219..a078a81 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -1496,7 +1496,7 @@ public class PomConstructionTest
         throws Exception
     {
         PomTestWrapper pom = this.buildPom( "plugin-management-duplicate/sub" 
);
-        assertEquals( 12, ( (List<?>) pom.getValue( 
"build/pluginManagement/plugins" ) ).size() );
+        assertEquals( 8, ( (List<?>) pom.getValue( 
"build/pluginManagement/plugins" ) ).size() );
     }
 
     public void testDistributionManagement()
diff --git 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index e61d110..cc55dac 100644
--- 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -76,28 +76,6 @@ under the License.
         <filtering>true</filtering>
       </testResource>
     </testResources>
-    <pluginManagement>
-      <!-- NOTE: These plugins will be removed from future versions of the 
super POM -->
-      <!-- They are kept for the moment as they are very unlikely to conflict 
with lifecycle mappings (MNG-4453) -->
-      <plugins>
-        <plugin>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>3.0.0</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-5</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.8</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.3</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
 
   <reporting>