Skip to content
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

[MNG-4840] fix requiredMavenVersion description #1444 #1456

Merged
merged 1 commit into from
Mar 27, 2024
Merged

[MNG-4840] fix requiredMavenVersion description #1444 #1456

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
8 changes: 5 additions & 3 deletions maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class PluginDescriptor extends ComponentSetDescriptor implements Cloneabl

private String description;

// MNG-4840
// MNG-4840: set from plugin's pom.xml, not plugin.xml
private String requiredMavenVersion;

private Plugin plugin;
Expand Down Expand Up @@ -297,17 +297,19 @@ public String getDescription() {
}

/**
* Set required Maven version.
* Set required Maven version, as defined in plugin's pom.xml (not plugin.xml).
*
* @param requiredMavenVersion Maven version required by the plugin
* @since 3.0.2
*/
// used by maven-core's org.apache.maven.plugin.internal.DefaultMavenPluginManager#getPluginDescriptor(...)
// but NOT PluginDescriptorBuilder
public void setRequiredMavenVersion(String requiredMavenVersion) {
this.requiredMavenVersion = requiredMavenVersion;
}

/**
* Get required Maven version.
* Get required Maven version, as defined in plugin's pom.xml (not plugin.xml).
*
* @return the Maven version required by the plugin
* @since 3.0.2
Expand Down
2 changes: 2 additions & 0 deletions ...-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;

/**
* Build plugin descriptor object from {@code plugin.xml}.
*
* @author Jason van Zyl
*/
public class PluginDescriptorBuilder {
Expand Down
9 changes: 0 additions & 9 deletions maven-plugin-api/src/main/mdo/plugin.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,6 @@ under the License.
<type>boolean</type>
<defaultValue>true</defaultValue>
</field>
<field>
<name>requiredMavenVersion</name>
<version>1.0.0</version>
<description>
Minimum Maven version required to use the plugin.
@since Maven 3.0.2
</description>
<type>String</type>
</field>
<field xdoc.separator="blank">
<name>mojos</name>
<version>1.0.0</version>
Expand Down
Loading