Skip to content

[MPLUGIN-425] Generate version ranges for automatically detected minimal #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kwin merged 1 commit into from
Nov 30, 2022
Merged

[MPLUGIN-425] Generate version ranges for automatically detected minimal #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/java-basic-annotations/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin-plugin/src/it/v4api/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
9 changes: 5 additions & 4 deletions ...n-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 + ",)";
}

/**
Expand Down
4 changes: 2 additions & 2 deletions maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/PluginToolsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,15 @@ 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
*/
PluginToolsRequest setRequiredJavaVersion( String requiredJavaVersion );

/**
*
* @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();
Expand Down