Skip to content

Fix NPE in EnhancedPluginDescriptorBuilder with Maven 4 #1094

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

Closed
gnodet wants to merge 1 commit into from
+12 −4
Closed

Fix NPE in EnhancedPluginDescriptorBuilder with Maven 4 #1094

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
16 changes: 12 additions & 4 deletions ...main/java/org/apache/maven/plugins/plugin/descriptor/EnhancedPluginDescriptorBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,18 @@ public PluginDescriptor build(Reader reader, String source) throws PlexusConfigu
PluginDescriptor pluginDescriptor = super.build(reader, source);
// elements added in plugin descriptor 1.1
ExtendedPluginDescriptor extendedPluginDescriptor = new ExtendedPluginDescriptor(pluginDescriptor);
extendedPluginDescriptor.setRequiredJavaVersion(
configuration.getChild("requiredJavaVersion").getValue());
extendedPluginDescriptor.setRequiredMavenVersion(
configuration.getChild("requiredMavenVersion").getValue());
if (configuration != null) {
// Maven 3.x path: buildConfiguration() was called by super.build(), so configuration is available
extendedPluginDescriptor.setRequiredJavaVersion(
configuration.getChild("requiredJavaVersion").getValue());
extendedPluginDescriptor.setRequiredMavenVersion(
configuration.getChild("requiredMavenVersion").getValue());
} else {
// Maven 4+ path: PluginDescriptorBuilder no longer calls buildConfiguration(),
// but already populates requiredJavaVersion/requiredMavenVersion on the descriptor
extendedPluginDescriptor.setRequiredJavaVersion(pluginDescriptor.getRequiredJavaVersion());
// requiredMavenVersion is already accessible through ExtendedPluginDescriptor's delegation
}
return extendedPluginDescriptor;
}

Expand Down
Loading