svn commit: r1778778 - in /maven/plugin-tools/trunk/maven-plugin-plugin/src: it/plugin-info-jdk/pom.xml main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java

[hboutemy]

Author: hboutemy
Date: Sat Jan 14 14:58:12 2017
New Revision: 1778778

URL: http://svn.apache.org/viewvc?rev=1778778&view=rev
Log:
[MPLUGIN-319] fixed compilation issue (no generics)

Modified:
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml
    
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java

Modified: 
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml?rev=1778778&r1=1778777&r2=1778778&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml 
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml 
Sat Jan 14 14:58:12 2017
@@ -90,10 +90,6 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
         <version>@project.version@</version>
-        <configuration>
-          <!-- ignore MNG-6109 issue, always use plugin.xml since there are no 
sources in this IT -->
-          <usePluginXmlMavenVersionRange>[2.0,)</usePluginXmlMavenVersionRange>
-        </configuration>
       </plugin>
     </plugins>
   </reporting>

Modified: 
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java?rev=1778778&r1=1778777&r2=1778778&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java
 Sat Jan 14 14:58:12 2017
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.plugin.
  */
 
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
@@ -50,10 +51,10 @@ public class MNG6109PluginDescriptorBuil
         for ( PlexusConfiguration d : parameterConfigurations )
         {
             String parameterName = d.getChild( "name" ).getValue();
+            Parameter pd = (Parameter) mojoDescriptor.getParameterMap().get( 
parameterName );
             
             String parameterSince = d.getChild( "since" ).getValue();
-            
-            mojoDescriptor.getParameterMap().get( parameterName ).setSince( 
parameterSince );
+            pd.setSince( parameterSince );
         }
         
         return mojoDescriptor;