MPLUGIN-79: Fix detection of JDK requirement
Submitted by: Benjamin Bentmann Reviewed by: Vincent Siveton o applied git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@632203 13f79535-47bb-0310-9956-ffa450edef68master
parent
b8e293a567
commit
da321cebe1
|
|
@ -522,11 +522,12 @@ public class PluginReport
|
||||||
}
|
}
|
||||||
if ( jdk == null )
|
if ( jdk == null )
|
||||||
{
|
{
|
||||||
jdk = discoverJdkRequirementFromPlugins( project.getPluginArtifactMap() );
|
jdk = discoverJdkRequirementFromPlugins( project.getBuild().getPluginsAsMap() );
|
||||||
}
|
}
|
||||||
if ( jdk == null )
|
if ( jdk == null )
|
||||||
{
|
{
|
||||||
jdk = System.getProperty( "java.specification.version" );
|
// The Maven Compiler Plugin uses a fixed default value, not the current JDK version.
|
||||||
|
jdk = "1.1";
|
||||||
}
|
}
|
||||||
|
|
||||||
return jdk;
|
return jdk;
|
||||||
|
|
@ -575,7 +576,7 @@ public class PluginReport
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( pluginConf.getChild( "target" ) != null )
|
if ( pluginConf.getChild( "target" ) == null )
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue