diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java index 2080bb1839..a601ae8d1d 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java @@ -269,8 +269,8 @@ public class DefaultLifecycleExecutor String goal = tok.nextToken().trim(); MojoDescriptor mojoDescriptor = getMojoDescriptor( goal, session, project ); - addToLifecycleMappings( lifecycleMappings, phase, new MojoExecution( mojoDescriptor ), session - .getSettings() ); + addToLifecycleMappings( lifecycleMappings, phase, new MojoExecution( mojoDescriptor ), + session.getSettings() ); } } diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml index 72682043c5..c869e0816f 100644 --- a/maven-core/src/main/resources/META-INF/plexus/components.xml +++ b/maven-core/src/main/resources/META-INF/plexus/components.xml @@ -217,6 +217,62 @@ + + org.apache.maven.lifecycle.mapping.LifecycleMapping + ejb + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + resources:resources + compiler:compile + resources:testResources + compiler:testCompile + surefire:test + ejb:ejb,source:jar + install:install + deploy:deploy + + + + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + war + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + resources:resources + compiler:compile + resources:testResources + compiler:testCompile + surefire:test + war:war + install:install + deploy:deploy + + + + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + ear + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + ear:generate-application-xml + ear:ear + install:install + deploy:deploy + + + + + org.apache.maven.plugin.version.PluginVersionManager default diff --git a/maven-plugins/maven-ear-plugin/src/main/resources/META-INF/plexus/components.xml b/maven-plugins/maven-ear-plugin/src/main/resources/META-INF/plexus/components.xml deleted file mode 100644 index 84d391b47c..0000000000 --- a/maven-plugins/maven-ear-plugin/src/main/resources/META-INF/plexus/components.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - org.apache.maven.lifecycle.mapping.LifecycleMapping - ear - org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping - - - - ear:generate-application-xml - ear:ear - install:install - deploy:deploy - - - - - - diff --git a/maven-plugins/maven-ejb-plugin/src/main/resources/META-INF/plexus/components.xml b/maven-plugins/maven-ejb-plugin/src/main/resources/META-INF/plexus/components.xml deleted file mode 100644 index 9395c6c670..0000000000 --- a/maven-plugins/maven-ejb-plugin/src/main/resources/META-INF/plexus/components.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - org.apache.maven.lifecycle.mapping.LifecycleMapping - ejb - org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping - - - - resources:resources - compiler:compile - resources:testResources - compiler:testCompile - surefire:test - ejb:ejb,source:jar - install:install - deploy:deploy - - - - - - diff --git a/maven-plugins/maven-war-plugin/src/main/resources/META-INF/plexus/components.xml b/maven-plugins/maven-war-plugin/src/main/resources/META-INF/plexus/components.xml deleted file mode 100644 index 794dc33140..0000000000 --- a/maven-plugins/maven-war-plugin/src/main/resources/META-INF/plexus/components.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - org.apache.maven.lifecycle.mapping.LifecycleMapping - war - org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping - - - - resources:resources - compiler:compile - resources:testResources - compiler:testCompile - surefire:test - war:war - install:install - deploy:deploy - - - - - -