You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kw...@apache.org on 2022/10/19 06:15:38 UTC
[maven] branch master updated: [MNG-7570] Plugin descriptor can carry the required Maven version (#832)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new daa8e1690 [MNG-7570] Plugin descriptor can carry the required Maven version (#832)
daa8e1690 is described below
commit daa8e1690226fc385db3d448ad962997afe3dba8
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Oct 19 08:15:28 2022 +0200
[MNG-7570] Plugin descriptor can carry the required Maven version (#832)
Its value takes precedence over POMs Maven prerequisite
---
.../org/apache/maven/plugin/internal/DefaultMavenPluginManager.java | 6 +++++-
.../org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java | 6 ++++++
maven-plugin-api/src/main/mdo/plugin.mdo | 6 ++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 2dc43a650..5496eef14 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -201,7 +201,11 @@ public class DefaultMavenPluginManager
pluginDescriptor = extractPluginDescriptor( pluginArtifact, plugin );
- pluginDescriptor.setRequiredMavenVersion( artifact.getProperty( "requiredMavenVersion", null ) );
+ if ( StringUtils.isBlank( pluginDescriptor.getRequiredMavenVersion() ) )
+ {
+ // only take value from underlying POM if plugin descriptor has no explicit Maven requirement
+ pluginDescriptor.setRequiredMavenVersion( artifact.getProperty( "requiredMavenVersion", null ) );
+ }
pluginDescriptorCache.put( cacheKey, pluginDescriptor );
}
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
index 3cbf64df1..98021fa0c 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
@@ -67,6 +67,7 @@ public class PluginDescriptorBuilder
pluginDescriptor.setIsolatedRealm( extractIsolatedRealm( c ) );
pluginDescriptor.setInheritedByDefault( extractInheritedByDefault( c ) );
pluginDescriptor.setRequiredJavaVersion( extractRequiredJavaVersion( c ).orElse( null ) );
+ pluginDescriptor.setRequiredMavenVersion( extractRequiredMavenVersion( c ).orElse( null ) );
pluginDescriptor.addMojos( extractMojos( c, pluginDescriptor ) );
@@ -147,6 +148,11 @@ public class PluginDescriptorBuilder
return Optional.ofNullable( c.getChild( "requiredJavaVersion" ) ).map( PlexusConfiguration::getValue );
}
+ private Optional<String> extractRequiredMavenVersion( PlexusConfiguration c )
+ {
+ return Optional.ofNullable( c.getChild( "requiredMavenVersion" ) ).map( PlexusConfiguration::getValue );
+ }
+
private List<ComponentDependency> extractComponentDependencies( PlexusConfiguration c )
{
diff --git a/maven-plugin-api/src/main/mdo/plugin.mdo b/maven-plugin-api/src/main/mdo/plugin.mdo
index 40b4a5985..7b4109b82 100644
--- a/maven-plugin-api/src/main/mdo/plugin.mdo
+++ b/maven-plugin-api/src/main/mdo/plugin.mdo
@@ -99,6 +99,12 @@ under the License.
<description>A version range which specifies the supported Java versions. The same values as for POM profile activation element 'jdk' are allowed, i.e. version ranges, version prefixes and negated version prefixes (starting with '!').</description>
<type>String</type>
</field>
+ <field>
+ <name>requiredMavenVersion</name>
+ <version>1.1.0+</version>
+ <description>A version range which specifies the supported Maven versions. A version range can either use the usual mathematical syntax "[2.0.10,2.1.0),[3.0,)" or use a single version "2.2.1". The latter is a short form for "[2.2.1,)", i.e. denotes the minimum version required. This value takes precedence over the POMs Maven prerequisite.</description>
+ <type>String</type>
+ </field>
<field xdoc.separator="blank">
<name>mojos</name>
<version>1.0.0+</version>