diff --git a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index e5a50c40a3..087e7e4ed6 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -1,9 +1,102 @@
+
+
+
+ org.apache.maven.artifact.handler.ArtifactHandler
+ pom
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
+
+ pom
+
+
+
+ org.apache.maven.lifecycle.mapping.LifecycleMapping
+ pom
+ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+
+
+
+ default
+
+
+ org.apache.maven.plugins:maven-site-plugin:attach-descriptor
+ org.apache.maven.plugins:maven-install-plugin:install
+ org.apache.maven.plugins:maven-deploy-plugin:deploy
+
+
+ org.apache.maven.plugins:maven-site-plugin:attach-descriptor
+
+
+
+
+
+
+
+
+
+ org.apache.maven.artifact.handler.ArtifactHandler
+ jar
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
+
+ jar
+ java
+ true
+
+
+
+ org.apache.maven.lifecycle.mapping.LifecycleMapping
+ jar
+ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+
+
+
+ default
+
+
+ org.apache.maven.plugins:maven-resources-plugin:resources
+ org.apache.maven.plugins:maven-compiler-plugin:compile
+
+ org.apache.maven.plugins:maven-resources-plugin:testResources
+
+ org.apache.maven.plugins:maven-compiler-plugin:testCompile
+ org.apache.maven.plugins:maven-surefire-plugin:test
+
+ org.apache.maven.plugins:maven-jar-plugin:jar
+
+ org.apache.maven.plugins:maven-install-plugin:install
+ org.apache.maven.plugins:maven-deploy-plugin:deploy
+
+
+
+
+
+
+
+
org.apache.maven.artifact.handler.ArtifactHandler
ejb
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
ejb
jar
@@ -11,22 +104,98 @@
true
-
+
+ org.apache.maven.lifecycle.mapping.LifecycleMapping
+
+ ejb
+ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+
+
+
+
+ default
+
+
+ org.apache.maven.plugins:maven-resources-plugin:resources
+
+ org.apache.maven.plugins:maven-compiler-plugin:compile
+
+
+ org.apache.maven.plugins:maven-resources-plugin:testResources
+
+ org.apache.maven.plugins:maven-compiler-plugin:testCompile
+
+ org.apache.maven.plugins:maven-surefire-plugin:test
+
+
+ org.apache.maven.plugins:maven-ejb-plugin:ejb
+
+ org.apache.maven.plugins:maven-install-plugin:install
+
+ org.apache.maven.plugins:maven-deploy-plugin:deploy
+
+
+
+
+
+
+
org.apache.maven.artifact.handler.ArtifactHandler
- jar
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ ejb-client
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
- jar
+ ejb-client
+ jar
+ ejb
+ client
java
true
+
+ org.apache.maven.artifact.handler.ArtifactHandler
+ ejb3
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
+
+ ejb3
+ true
+ java
+ false
+
+
+
+ org.apache.maven.lifecycle.mapping.LifecycleMapping
+ ejb3
+ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+
+
+
+ org.apache.maven.plugins:maven-resources-plugin:resources
+ org.apache.maven.plugins:maven-compiler-plugin:compile
+ org.apache.maven.plugins:maven-resources-plugin:testResources
+ org.apache.maven.plugins:maven-compiler-plugin:testCompile
+ org.apache.maven.plugins:maven-surefire-plugin:test
+
+ org.apache.maven.plugins:maven-ejb3-plugin:ejb3
+
+ org.apache.maven.plugins:maven-install-plugin:install
+ org.apache.maven.plugins:maven-deploy-plugin:deploy
+
+
+
+
+
org.apache.maven.artifact.handler.ArtifactHandler
test-jar
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
tests
jar
@@ -37,10 +206,14 @@
+
org.apache.maven.artifact.handler.ArtifactHandler
maven-plugin
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
maven-plugin
jar
@@ -48,20 +221,50 @@
true
-
- org.apache.maven.artifact.handler.ArtifactHandler
- pom
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ org.apache.maven.lifecycle.mapping.LifecycleMapping
+ maven-plugin
+ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
- pom
+
+
+ default
+
+
+ org.apache.maven.plugins:maven-plugin-plugin:descriptor
+ org.apache.maven.plugins:maven-resources-plugin:resources
+ org.apache.maven.plugins:maven-compiler-plugin:compile
+
+ org.apache.maven.plugins:maven-resources-plugin:testResources
+
+ org.apache.maven.plugins:maven-compiler-plugin:testCompile
+ org.apache.maven.plugins:maven-surefire-plugin:test
+
+ org.apache.maven.plugins:maven-jar-plugin:jar,
+ org.apache.maven.plugins:maven-plugin-plugin:addPluginArtifactMetadata
+
+
+ org.apache.maven.plugins:maven-install-plugin:install,
+ org.apache.maven.plugins:maven-plugin-plugin:updateRegistry
+
+
+ org.apache.maven.plugins:maven-deploy-plugin:deploy
+
+
+
+
+
-
+
+
org.apache.maven.artifact.handler.ArtifactHandler
java-source
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
sources
java-source
@@ -71,10 +274,14 @@
+
org.apache.maven.artifact.handler.ArtifactHandler
javadoc
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
javadoc
javadoc
@@ -84,10 +291,14 @@
+
org.apache.maven.artifact.handler.ArtifactHandler
war
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
war
true
@@ -95,11 +306,41 @@
false
+
+ org.apache.maven.lifecycle.mapping.LifecycleMapping
+ war
+ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+
+
+
+ default
+
+
+ org.apache.maven.plugins:maven-resources-plugin:resources
+ org.apache.maven.plugins:maven-compiler-plugin:compile
+
+ org.apache.maven.plugins:maven-resources-plugin:testResources
+
+ org.apache.maven.plugins:maven-compiler-plugin:testCompile
+ org.apache.maven.plugins:maven-surefire-plugin:test
+ org.apache.maven.plugins:maven-war-plugin:war
+ org.apache.maven.plugins:maven-install-plugin:install
+ org.apache.maven.plugins:maven-deploy-plugin:deploy
+
+
+
+
+
+
+
org.apache.maven.artifact.handler.ArtifactHandler
ear
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
ear
true
@@ -107,25 +348,38 @@
false
-
- org.apache.maven.artifact.handler.ArtifactHandler
- ejb-client
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ org.apache.maven.lifecycle.mapping.LifecycleMapping
+ ear
+ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
- ejb-client
- jar
- ejb
- client
- java
- true
+
+
+ default
+
+
+
+ org.apache.maven.plugins:maven-ear-plugin:generate-application-xml
+
+ org.apache.maven.plugins:maven-resources-plugin:resources
+ org.apache.maven.plugins:maven-ear-plugin:ear
+ org.apache.maven.plugins:maven-install-plugin:install
+ org.apache.maven.plugins:maven-deploy-plugin:deploy
+
+
+
+
+
org.apache.maven.artifact.handler.ArtifactHandler
rar
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
rar
true
@@ -133,11 +387,41 @@
false
+
+ org.apache.maven.lifecycle.mapping.LifecycleMapping
+ rar
+ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+
+
+
+ default
+
+
+ org.apache.maven.plugins:maven-resources-plugin:resources
+ org.apache.maven.plugins:maven-compiler-plugin:compile
+
+ org.apache.maven.plugins:maven-resources-plugin:testResources
+
+ org.apache.maven.plugins:maven-compiler-plugin:testCompile
+ org.apache.maven.plugins:maven-surefire-plugin:test
+ org.apache.maven.plugins:maven-rar-plugin:rar
+ org.apache.maven.plugins:maven-install-plugin:install
+ org.apache.maven.plugins:maven-deploy-plugin:deploy
+
+
+
+
+
+
+
org.apache.maven.artifact.handler.ArtifactHandler
par
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ org.apache.maven.artifact.handler.DefaultArtifactHandler
+
par
true
@@ -145,17 +429,26 @@
false
-
- org.apache.maven.artifact.handler.ArtifactHandler
- ejb3
- org.apache.maven.artifact.handler.DefaultArtifactHandler
+ org.apache.maven.lifecycle.mapping.LifecycleMapping
+ par
+ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
- ejb3
- true
- java
- false
+
+
+ org.apache.maven.plugins:maven-resources-plugin:resources
+ org.apache.maven.plugins:maven-compiler-plugin:compile
+ org.apache.maven.plugins:maven-resources-plugin:testResources
+ org.apache.maven.plugins:maven-compiler-plugin:testCompile
+ org.apache.maven.plugins:maven-surefire-plugin:test
+
+ org.apache.maven.plugins:maven-par-plugin:par
+
+ org.apache.maven.plugins:maven-install-plugin:install
+ org.apache.maven.plugins:maven-deploy-plugin:deploy
+
+
-
+
\ No newline at end of file
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 8fb7cc9ae0..3958661982 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -17,6 +17,13 @@ specific language governing permissions and limitations
under the License.
-->
+
@@ -119,248 +126,6 @@ under the License.
-
-
-
-
- org.apache.maven.lifecycle.mapping.LifecycleMapping
- pom
- org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-
-
-
- default
-
-
- org.apache.maven.plugins:maven-site-plugin:attach-descriptor
- org.apache.maven.plugins:maven-install-plugin:install
- org.apache.maven.plugins:maven-deploy-plugin:deploy
-
-
- org.apache.maven.plugins:maven-site-plugin:attach-descriptor
-
-
-
-
-
-
-
-
- org.apache.maven.lifecycle.mapping.LifecycleMapping
- jar
- org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-
-
-
- default
-
-
- org.apache.maven.plugins:maven-resources-plugin:resources
- org.apache.maven.plugins:maven-compiler-plugin:compile
-
- org.apache.maven.plugins:maven-resources-plugin:testResources
-
- org.apache.maven.plugins:maven-compiler-plugin:testCompile
- org.apache.maven.plugins:maven-surefire-plugin:test
-
- org.apache.maven.plugins:maven-jar-plugin:jar
-
- org.apache.maven.plugins:maven-install-plugin:install
- org.apache.maven.plugins:maven-deploy-plugin:deploy
-
-
-
-
-
-
-
-
- org.apache.maven.lifecycle.mapping.LifecycleMapping
- maven-plugin
- org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-
-
-
- default
-
-
- org.apache.maven.plugins:maven-plugin-plugin:descriptor
- org.apache.maven.plugins:maven-resources-plugin:resources
- org.apache.maven.plugins:maven-compiler-plugin:compile
-
- org.apache.maven.plugins:maven-resources-plugin:testResources
-
- org.apache.maven.plugins:maven-compiler-plugin:testCompile
- org.apache.maven.plugins:maven-surefire-plugin:test
-
- org.apache.maven.plugins:maven-jar-plugin:jar,
- org.apache.maven.plugins:maven-plugin-plugin:addPluginArtifactMetadata
-
-
- org.apache.maven.plugins:maven-install-plugin:install,
- org.apache.maven.plugins:maven-plugin-plugin:updateRegistry
-
-
- org.apache.maven.plugins:maven-deploy-plugin:deploy
-
-
-
-
-
-
-
-
-
- org.apache.maven.lifecycle.mapping.LifecycleMapping
- ejb
- org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-
-
-
- default
-
-
- org.apache.maven.plugins:maven-resources-plugin:resources
- org.apache.maven.plugins:maven-compiler-plugin:compile
-
- org.apache.maven.plugins:maven-resources-plugin:testResources
-
- org.apache.maven.plugins:maven-compiler-plugin:testCompile
- org.apache.maven.plugins:maven-surefire-plugin:test
-
- org.apache.maven.plugins:maven-ejb-plugin:ejb
-
- org.apache.maven.plugins:maven-install-plugin:install
- org.apache.maven.plugins:maven-deploy-plugin:deploy
-
-
-
-
-
-
-
-
- org.apache.maven.lifecycle.mapping.LifecycleMapping
- war
- org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-
-
-
- default
-
-
- org.apache.maven.plugins:maven-resources-plugin:resources
- org.apache.maven.plugins:maven-compiler-plugin:compile
-
- org.apache.maven.plugins:maven-resources-plugin:testResources
-
- org.apache.maven.plugins:maven-compiler-plugin:testCompile
- org.apache.maven.plugins:maven-surefire-plugin:test
- org.apache.maven.plugins:maven-war-plugin:war
- org.apache.maven.plugins:maven-install-plugin:install
- org.apache.maven.plugins:maven-deploy-plugin:deploy
-
-
-
-
-
-
-
-
- org.apache.maven.lifecycle.mapping.LifecycleMapping
- ear
- org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-
-
-
- default
-
-
-
- org.apache.maven.plugins:maven-ear-plugin:generate-application-xml
-
- org.apache.maven.plugins:maven-resources-plugin:resources
- org.apache.maven.plugins:maven-ear-plugin:ear
- org.apache.maven.plugins:maven-install-plugin:install
- org.apache.maven.plugins:maven-deploy-plugin:deploy
-
-
-
-
-
-
-
-
- org.apache.maven.lifecycle.mapping.LifecycleMapping
- rar
- org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-
-
-
- default
-
-
- org.apache.maven.plugins:maven-resources-plugin:resources
- org.apache.maven.plugins:maven-compiler-plugin:compile
-
- org.apache.maven.plugins:maven-resources-plugin:testResources
-
- org.apache.maven.plugins:maven-compiler-plugin:testCompile
- org.apache.maven.plugins:maven-surefire-plugin:test
- org.apache.maven.plugins:maven-rar-plugin:rar
- org.apache.maven.plugins:maven-install-plugin:install
- org.apache.maven.plugins:maven-deploy-plugin:deploy
-
-
-
-
-
-
-
-
- org.apache.maven.lifecycle.mapping.LifecycleMapping
- par
- org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-
-
-
- org.apache.maven.plugins:maven-resources-plugin:resources
- org.apache.maven.plugins:maven-compiler-plugin:compile
- org.apache.maven.plugins:maven-resources-plugin:testResources
- org.apache.maven.plugins:maven-compiler-plugin:testCompile
- org.apache.maven.plugins:maven-surefire-plugin:test
-
- org.apache.maven.plugins:maven-par-plugin:par
-
- org.apache.maven.plugins:maven-install-plugin:install
- org.apache.maven.plugins:maven-deploy-plugin:deploy
-
-
-
-
-
-
- org.apache.maven.lifecycle.mapping.LifecycleMapping
- ejb3
- org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
-
-
-
- org.apache.maven.plugins:maven-resources-plugin:resources
- org.apache.maven.plugins:maven-compiler-plugin:compile
- org.apache.maven.plugins:maven-resources-plugin:testResources
- org.apache.maven.plugins:maven-compiler-plugin:testCompile
- org.apache.maven.plugins:maven-surefire-plugin:test
-
- org.apache.maven.plugins:maven-ejb3-plugin:ejb3
-
- org.apache.maven.plugins:maven-install-plugin:install
- org.apache.maven.plugins:maven-deploy-plugin:deploy
-
-
-
-
+