From 428eda668faca1a947e7856928f76d52c5ef9739 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Fri, 5 Dec 2025 18:46:16 +0100 Subject: [PATCH] Add default implementation for new method in MavenPluginManager MavenPluginManager can be implemented by user extension new method in interface can brake an implementation. We can add default implementation in interface to avoid braking change. --- .../java/org/apache/maven/plugin/MavenPluginManager.java | 8 ++++++-- .../maven/plugin/internal/DefaultMavenPluginManager.java | 6 ------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java index 06389c2633c9..f2f25bca4e19 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java @@ -74,7 +74,9 @@ MojoDescriptor getMojoDescriptor( * @deprecated Use {@link #checkPrerequisites(PluginDescriptor)} instead. */ @Deprecated - void checkRequiredMavenVersion(PluginDescriptor pluginDescriptor) throws PluginIncompatibleException; + default void checkRequiredMavenVersion(PluginDescriptor pluginDescriptor) throws PluginIncompatibleException { + checkPrerequisites(pluginDescriptor); + } /** * Verifies that the specified plugin's prerequisites are met. @@ -82,7 +84,9 @@ MojoDescriptor getMojoDescriptor( * @param pluginDescriptor The descriptor of the plugin to check, must not be {@code null}. * @since 3.9.12 */ - void checkPrerequisites(PluginDescriptor pluginDescriptor) throws PluginIncompatibleException; + default void checkPrerequisites(PluginDescriptor pluginDescriptor) throws PluginIncompatibleException { + checkRequiredMavenVersion(pluginDescriptor); + } /** * Sets up the class realm for the specified plugin. Both the class realm and the plugin artifacts that constitute 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 b3ed2123851d..85ae59530db3 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 @@ -309,12 +309,6 @@ public void checkPrerequisites(PluginDescriptor pluginDescriptor) throws PluginI } } - @Override - @Deprecated - public void checkRequiredMavenVersion(PluginDescriptor pluginDescriptor) throws PluginIncompatibleException { - checkPrerequisites(pluginDescriptor); - } - public void setupPluginRealm( PluginDescriptor pluginDescriptor, MavenSession session,