diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategy.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategy.java index 6a6d16cb1510..93818670b1c0 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategy.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategy.java @@ -67,9 +67,8 @@ public class PluginUpgradeStrategy extends AbstractUpgradeStrategy { private static final List PLUGIN_UPGRADES = List.of( new PluginUpgrade( - DEFAULT_MAVEN_PLUGIN_GROUP_ID, "maven-compiler-plugin", "3.2.0", MAVEN_4_COMPATIBILITY_REASON), - new PluginUpgrade( - DEFAULT_MAVEN_PLUGIN_GROUP_ID, "maven-exec-plugin", "3.2.0", MAVEN_4_COMPATIBILITY_REASON), + DEFAULT_MAVEN_PLUGIN_GROUP_ID, "maven-compiler-plugin", "3.2", MAVEN_4_COMPATIBILITY_REASON), + new PluginUpgrade("org.codehaus.mojo", "exec-maven-plugin", "3.2.0", MAVEN_4_COMPATIBILITY_REASON), new PluginUpgrade( DEFAULT_MAVEN_PLUGIN_GROUP_ID, "maven-enforcer-plugin", "3.5.0", MAVEN_4_COMPATIBILITY_REASON), new PluginUpgrade("org.codehaus.mojo", "flatten-maven-plugin", "1.2.7", MAVEN_4_COMPATIBILITY_REASON), diff --git a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategyTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategyTest.java index d1961700e76b..a9a064e1f735 100644 --- a/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategyTest.java +++ b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategyTest.java @@ -521,8 +521,8 @@ void shouldNotUpgradePluginWithoutVersion() throws Exception { - org.apache.maven.plugins - maven-exec-plugin + org.codehaus.mojo + exec-maven-plugin @@ -553,8 +553,8 @@ void shouldNotUpgradeWhenPropertyNotFound() throws Exception { - org.apache.maven.plugins - maven-exec-plugin + org.codehaus.mojo + exec-maven-plugin ${exec.plugin.version} @@ -737,7 +737,7 @@ void shouldHavePredefinedPluginUpgrades() throws Exception { boolean hasCompilerPlugin = upgrades.stream().anyMatch(upgrade -> "maven-compiler-plugin".equals(upgrade.artifactId())); boolean hasExecPlugin = - upgrades.stream().anyMatch(upgrade -> "maven-exec-plugin".equals(upgrade.artifactId())); + upgrades.stream().anyMatch(upgrade -> "exec-maven-plugin".equals(upgrade.artifactId())); boolean hasSurefirePlugin = upgrades.stream().anyMatch(upgrade -> "maven-surefire-plugin".equals(upgrade.artifactId())); boolean hasFailsafePlugin = @@ -746,7 +746,7 @@ void shouldHavePredefinedPluginUpgrades() throws Exception { upgrades.stream().anyMatch(upgrade -> "maven-surefire-report-plugin".equals(upgrade.artifactId())); assertTrue(hasCompilerPlugin, "Should include maven-compiler-plugin upgrade"); - assertTrue(hasExecPlugin, "Should include maven-exec-plugin upgrade"); + assertTrue(hasExecPlugin, "Should include exec-maven-plugin upgrade"); assertTrue(hasSurefirePlugin, "Should include maven-surefire-plugin upgrade"); assertTrue(hasFailsafePlugin, "Should include maven-failsafe-plugin upgrade"); assertTrue(hasSurefireReportPlugin, "Should include maven-surefire-report-plugin upgrade");