stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[MPLUGIN-319] fixed compilation issue (no generics) 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1778778 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2017-01-14 14:58:12 +00:00
parent bcf94564ba
commit 3ec7f6f61d
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml
View File

@ -90,10 +90,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId> <artifactId>maven-plugin-plugin</artifactId>
<version>@project.version@</version> <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> </plugin>
</plugins> </plugins>
</reporting> </reporting>

5
maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java
View File

@ -20,6 +20,7 @@ package org.apache.maven.plugins.plugin.descriptor;
*/ */
import org.apache.maven.plugin.descriptor.MojoDescriptor; 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.PluginDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder; import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.configuration.PlexusConfiguration;
@ -50,10 +51,10 @@ public class MNG6109PluginDescriptorBuilder extends PluginDescriptorBuilder
for ( PlexusConfiguration d : parameterConfigurations ) for ( PlexusConfiguration d : parameterConfigurations )
{ {
String parameterName = d.getChild( "name" ).getValue(); String parameterName = d.getChild( "name" ).getValue();
Parameter pd = (Parameter) mojoDescriptor.getParameterMap().get( parameterName );
String parameterSince = d.getChild( "since" ).getValue(); String parameterSince = d.getChild( "since" ).getValue();
pd.setSince( parameterSince );
mojoDescriptor.getParameterMap().get( parameterName ).setSince( parameterSince );
} }
return mojoDescriptor; return mojoDescriptor;