diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy b/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy index b3f34ed83..51ba67d4b 100644 --- a/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy +++ b/maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy @@ -25,7 +25,7 @@ assert descriptorFile.isFile() def pluginDescriptor = new XmlParser().parse( descriptorFile ); -assert pluginDescriptor.requiredJavaVersion.text() == '1.8' +assert pluginDescriptor.requiredJavaVersion.text() == '[1.8,)' assert pluginDescriptor.requiredMavenVersion.text() == '3.2.5' def mojo = pluginDescriptor.mojos.mojo.findAll{ it.goal.text() == "first" }[0] diff --git a/maven-plugin-plugin/src/it/v4api/verify.groovy b/maven-plugin-plugin/src/it/v4api/verify.groovy index c3c4967cb..8d147efa3 100644 --- a/maven-plugin-plugin/src/it/v4api/verify.groovy +++ b/maven-plugin-plugin/src/it/v4api/verify.groovy @@ -22,7 +22,7 @@ assert descriptorFile.isFile() def pluginDescriptor = new XmlParser().parse( descriptorFile ); -assert pluginDescriptor.requiredJavaVersion.text() == '1.8' +assert pluginDescriptor.requiredJavaVersion.text() == '[1.8,)' assert pluginDescriptor.requiredMavenVersion.text() == '4.0.0-alpha-2' def mojo = pluginDescriptor.mojos.mojo.findAll{ it.goal.text() == "first" }[0] diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java index b50d86704..1696335a9 100644 --- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java +++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java @@ -448,14 +448,15 @@ private String getRequiredJavaVersion( PluginToolsRequest request ) { return requiredJavaVersion; } - String requiredJavaVersion = request.getRequiredJavaVersion(); - if ( requiredJavaVersion == null ) + String minRequiredJavaVersion = request.getRequiredJavaVersion(); + if ( minRequiredJavaVersion == null ) { - getLog().warn( "Cannot determine the required Java version automatically, it is recommended to " + getLog().warn( "Cannot determine the minimally required Java version automatically, it is recommended to " + "configure some explicit value manually." ); + return null; } - return requiredJavaVersion; + return "[" + minRequiredJavaVersion + ",)"; } /** diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java index a0721e80a..a014ad3c7 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java @@ -200,7 +200,7 @@ public interface PluginToolsRequest /** * - * @param requiredJavaVersion the required java version for this plugin or {@code null} if unknown. + * @param requiredJavaVersion the minimally required java version for this plugin or {@code null} if unknown. * @return This request. * @since 3.8.0 */ @@ -208,7 +208,7 @@ public interface PluginToolsRequest /** * - * @return the required java version for this plugin or {@code null} if unknown. + * @return the minimally required java version for this plugin or {@code null} if unknown. * @since 3.8.0 */ String getRequiredJavaVersion();