This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 72a125e [MNG-7022] Remove o.a.m.lifecycle.mapping.Lifecycle optional
mojos backward compat code
72a125e is described below
commit 72a125ef041ff28026906b7a4473fc4354bd8a37
Author: Michael Osipov <[email protected]>
AuthorDate: Sat Nov 14 01:22:49 2020 +0100
[MNG-7022] Remove o.a.m.lifecycle.mapping.Lifecycle optional mojos backward
compat code
This closes #396
---
.../main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java | 8 --------
maven-core/src/test/resources/META-INF/plexus/components.xml | 8 +-------
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
index 27f612f..72a9c09 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
@@ -21,7 +21,6 @@ package org.apache.maven.lifecycle.mapping;
import java.util.Collections;
import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
@@ -40,13 +39,6 @@ public class Lifecycle
*/
private Map<String, LifecyclePhase> lifecyclePhases;
- /*
- * NOTE: This exists merely for backward-compat with legacy-style
lifecycle definitions and allows configuration
- * injection to work instead of failing.
- */
- @SuppressWarnings( "unused" )
- private List<String> optionalMojos;
-
/**
* Method getId
*/
diff --git a/maven-core/src/test/resources/META-INF/plexus/components.xml
b/maven-core/src/test/resources/META-INF/plexus/components.xml
index 714cb36..6aa5a06 100644
--- a/maven-core/src/test/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/test/resources/META-INF/plexus/components.xml
@@ -76,9 +76,6 @@
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
</phases>
- <optional-mojos>
-
<optional-mojo>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</optional-mojo>
- </optional-mojos>
<!-- END SNIPPET: pom-lifecycle -->
</lifecycle>
</lifecycles>
@@ -101,13 +98,10 @@
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
</phases>
- <optional-mojos>
-
<optional-mojo>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</optional-mojo>
- </optional-mojos>
<!-- END SNIPPET: pom-lifecycle -->
</lifecycle>
</lifecycles>
</configuration>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
