You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/12/26 00:22:56 UTC
svn commit: r1647925 -
/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
Author: hboutemy
Date: Thu Dec 25 23:22:56 2014
New Revision: 1647925
URL: http://svn.apache.org/r1647925
Log:
improved java version discovery algorithm with ideas taken from MPIR
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java?rev=1647925&r1=1647924&r2=1647925&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java Thu Dec 25 23:22:56 2014
@@ -684,17 +684,12 @@ public class PluginReport
@SuppressWarnings( "unchecked" )
Plugin compiler = getCompilerPlugin( project.getBuild().getPluginsAsMap() );
-
- jdk = getTarget( compiler );
- if ( jdk != null )
+ if ( compiler == null )
{
- return jdk;
+ compiler = getCompilerPlugin( project.getPluginManagement().getPluginsAsMap() );
}
- @SuppressWarnings( "unchecked" )
- Plugin compilerManagement = getCompilerPlugin( project.getPluginManagement().getPluginsAsMap() );
-
- jdk = getTarget( compilerManagement );
+ jdk = getPluginParameter( compiler, "target" );
if ( jdk != null )
{
return jdk;
@@ -707,12 +702,9 @@ public class PluginReport
return jdk;
}
- String version = getVersion( compiler );
+ // return "1.5" by default?
- if ( version == null )
- {
- version = getVersion( compilerManagement );
- }
+ String version = ( compiler == null ) ? null : compiler.getVersion();
if ( version != null )
{
@@ -724,17 +716,10 @@ public class PluginReport
private static Plugin getCompilerPlugin( Map<String, Object> pluginsAsMap )
{
- for ( Map.Entry<String, Object> entry : pluginsAsMap.entrySet() )
- {
- if ( entry.getKey().equals( "org.apache.maven.plugins:maven-compiler-plugin" ) )
- {
- return (Plugin) entry.getValue();
- }
- }
- return null;
+ return (Plugin) pluginsAsMap.get( "org.apache.maven.plugins:maven-compiler-plugin" );
}
- private static String getTarget( Plugin plugin )
+ private static String getPluginParameter( Plugin plugin, String parameter )
{
if ( plugin != null )
{
@@ -742,7 +727,7 @@ public class PluginReport
if ( pluginConf != null )
{
- Xpp3Dom target = pluginConf.getChild( "target" );
+ Xpp3Dom target = pluginConf.getChild( parameter );
if ( target != null )
{
@@ -752,16 +737,6 @@ public class PluginReport
}
return null;
- }
-
- private static String getVersion( Plugin plugin )
- {
- if ( plugin != null )
- {
- return plugin.getVersion();
- }
-
- return null;
}
}
}