Skip to content

Restore buildConfiguration() callback in deprecated PluginDescriptorBuilder.build() methods #11869

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

Draft
gnodet wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −2
Draft

Restore buildConfiguration() callback in deprecated PluginDescriptorBuilder.build() methods #11869

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
38 changes: 36 additions & 2 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 @@ -71,7 +71,24 @@ public PluginDescriptor build(Reader reader) throws PlexusConfigurationException
*/
@Deprecated
public PluginDescriptor build(Reader reader, String source) throws PlexusConfigurationException {
return build(() -> reader, source);
try {
BufferedReader br = new BufferedReader(reader, BUFFER_SIZE);
br.mark(BUFFER_SIZE);
XMLStreamReader xsr = XMLInputFactory.newFactory().createXMLStreamReader(br);
xsr.nextTag();
String nsUri = xsr.getNamespaceURI();
br.reset();
if (PLUGIN_2_0_0.equals(nsUri)) {
xsr = XMLInputFactory.newFactory().createXMLStreamReader(br);
return new PluginDescriptor(new PluginDescriptorStaxReader().read(xsr, true));
} else {
// Call buildConfiguration() for backward compatibility with subclasses that override it
PlexusConfiguration cfg = buildConfiguration(br);
return build(source, cfg);
}
} catch (XMLStreamException | IOException e) {
throw new PlexusConfigurationException(e.getMessage(), e);
}
}

public PluginDescriptor build(ReaderSupplier readerSupplier) throws PlexusConfigurationException {
Expand All @@ -98,7 +115,24 @@ public PluginDescriptor build(ReaderSupplier readerSupplier, String source) thro
*/
@Deprecated
public PluginDescriptor build(InputStream input, String source) throws PlexusConfigurationException {
return build(() -> input, source);
try {
BufferedInputStream bis = new BufferedInputStream(input, BUFFER_SIZE);
bis.mark(BUFFER_SIZE);
XMLStreamReader xsr = XMLInputFactory.newFactory().createXMLStreamReader(bis);
xsr.nextTag();
String nsUri = xsr.getNamespaceURI();
bis.reset();
if (PLUGIN_2_0_0.equals(nsUri)) {
xsr = XMLInputFactory.newFactory().createXMLStreamReader(bis);
return new PluginDescriptor(new PluginDescriptorStaxReader().read(xsr, true));
} else {
// Call buildConfiguration() for backward compatibility with subclasses that override it
PlexusConfiguration cfg = buildConfiguration(bis);
return build(source, cfg);
}
} catch (XMLStreamException | IOException e) {
throw new PlexusConfigurationException(e.getMessage(), e);
}
}

public PluginDescriptor build(StreamSupplier inputSupplier) throws PlexusConfigurationException {
Expand Down