Skip to content

Commit 3002b40

Browse files
[MNG-8717] Remove maven-plugin-plugin:addPluginArtifactMetadata from default binding
1 parent d65c375 commit 3002b40

File tree

5 files changed

+2
-179
lines changed

5 files changed

+2
-179
lines changed

impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/MavenPluginLifecycleMappingProvider.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ public final class MavenPluginLifecycleMappingProvider extends AbstractLifecycle
3838
"org.apache.maven.plugins:maven-resources-plugin:" + RESOURCES_PLUGIN_VERSION + ":testResources",
3939
"test-compile", "org.apache.maven.plugins:maven-compiler-plugin:" + COMPILER_PLUGIN_VERSION + ":testCompile",
4040
"test", "org.apache.maven.plugins:maven-surefire-plugin:" + SUREFIRE_PLUGIN_VERSION + ":test",
41-
"package",
42-
"org.apache.maven.plugins:maven-jar-plugin:" + JAR_PLUGIN_VERSION + ":jar,"
43-
+ "org.apache.maven.plugins:maven-plugin-plugin:" + PLUGIN_PLUGIN_VERSION
44-
+ ":addPluginArtifactMetadata",
41+
"package", "org.apache.maven.plugins:maven-jar-plugin:" + JAR_PLUGIN_VERSION + ":jar,",
4542
"install", "org.apache.maven.plugins:maven-install-plugin:" + INSTALL_PLUGIN_VERSION + ":install",
4643
"deploy", "org.apache.maven.plugins:maven-deploy-plugin:" + DEPLOY_PLUGIN_VERSION + ":deploy"
4744
};

impl/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ public void testCalculationOfBuildPlanWithMultipleExecutionsOfModello() throws E
217217
// [12] compiler:testCompile
218218
// [13] surefire:test
219219
// [14] jar:jar
220-
// [15] plugin:addPluginArtifactMetadata
221-
// [16] install:install
220+
// [15] install:install
222221
//
223222

224223
assertListEquals(
@@ -237,7 +236,6 @@ public void testCalculationOfBuildPlanWithMultipleExecutionsOfModello() throws E
237236
"compiler:testCompile",
238237
"surefire:test",
239238
"jar:jar",
240-
"plugin:addPluginArtifactMetadata",
241239
"install:install"),
242240
executions.stream()
243241
.map(execution -> execution.getMojoDescriptor().getFullGoalName())

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ public void testit0138() throws Exception {
5454
verifier.verifyFilePresent("target/compiler-test-compile.txt");
5555
verifier.verifyFilePresent("target/surefire-test.txt");
5656
verifier.verifyFilePresent("target/jar-jar.txt");
57-
verifier.verifyFilePresent("target/plugin-add-plugin-artifact-metadata.txt");
5857
verifier.verifyFilePresent("target/install-install.txt");
59-
if (matchesVersionRange("(,2.2.0)")) {
60-
verifier.verifyFilePresent("target/plugin-update-registry.txt");
61-
}
6258
verifier.verifyFilePresent("target/deploy-deploy.txt");
6359
verifier.verifyErrorFreeLog();
6460
}

its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/AddPluginArtifactMetadataMojo.java

Lines changed: 0 additions & 84 deletions
This file was deleted.

its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/UpdateRegistryMojo.java

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)