From 6c032edddbe4175bdd2aeea347851b68e7c30f40 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sat, 10 Nov 2012 14:21:58 +0000 Subject: [PATCH] |MNG-5370] moved plugin bindings to default lifecycle configuration to default-bindings.xml to let only artifact handlers configuration in artifact-handlers.xml git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407821 13f79535-47bb-0310-9956-ffa450edef68 --- .../META-INF/plexus/artifact-handlers.xml | 345 +-------------- .../META-INF/plexus/default-bindings.xml | 399 ++++++++++++++++++ .../src/site/apt/default-bindings.apt.vm | 18 +- 3 files changed, 409 insertions(+), 353 deletions(-) create mode 100644 maven-core/src/main/resources/META-INF/plexus/default-bindings.xml 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 58d3ac2494..855e9b7a92 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 @@ -21,13 +21,7 @@ under the License. @@ -44,28 +38,6 @@ problem. pom - - org.apache.maven.lifecycle.mapping.LifecycleMapping - pom - org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping - - - - default - - - - org.apache.maven.plugins:maven-install-plugin:2.3.1:install - - - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy - - - - - - - - - - org.apache.maven.plugins:maven-resources-plugin:2.5:resources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile - - - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile - - - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test - - - org.apache.maven.plugins:maven-jar-plugin:2.3.2:jar - - - org.apache.maven.plugins:maven-install-plugin:2.3.1:install - - - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy - - - - - - - - - - org.apache.maven.plugins:maven-resources-plugin:2.5:resources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile - - - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile - - - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test - - - org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb - - - org.apache.maven.plugins:maven-install-plugin:2.3.1:install - - - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy - - - - - - - org.apache.maven.artifact.handler.ArtifactHandler ejb-client @@ -199,46 +91,6 @@ problem. false - - org.apache.maven.lifecycle.mapping.LifecycleMapping - ejb3 - org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping - - - - default - - - - org.apache.maven.plugins:maven-resources-plugin:2.5:resources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile - - - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile - - - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test - - - org.apache.maven.plugins:maven-ejb3-plugin:ejb3 - - - org.apache.maven.plugins:maven-install-plugin:2.3.1:install - - - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy - - - - - - - - - - org.apache.maven.plugins:maven-plugin-plugin:2.9:descriptor - - - org.apache.maven.plugins:maven-resources-plugin:2.5:resources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile - - - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile - - - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test - - - org.apache.maven.plugins:maven-jar-plugin:2.3.1:jar, - org.apache.maven.plugins:maven-plugin-plugin:2.9:addPluginArtifactMetadata - - - org.apache.maven.plugins:maven-install-plugin:2.3.1:install - - - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy - - - - - - - - - - org.apache.maven.plugins:maven-resources-plugin:2.5:resources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile - - - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile - - - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test - - - org.apache.maven.plugins:maven-war-plugin:2.1.1:war - - - org.apache.maven.plugins:maven-install-plugin:2.3.1:install - - - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy - - - - - - - - - - org.apache.maven.plugins:maven-ear-plugin:2.5:generate-application-xml - - - org.apache.maven.plugins:maven-resources-plugin:2.4.3:resources - - - org.apache.maven.plugins:maven-ear-plugin:2.6:ear - - - org.apache.maven.plugins:maven-install-plugin:2.3.1:install - - - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy - - - - - - - - - - org.apache.maven.plugins:maven-resources-plugin:2.5:resources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile - - - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile - - - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test - - - org.apache.maven.plugins:maven-rar-plugin:2.2:rar - - - org.apache.maven.plugins:maven-install-plugin:2.3.1:install - - - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy - - - - - - - - - - org.apache.maven.plugins:maven-resources-plugin:2.5:resources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile - - - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources - - - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile - - - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test - - - org.apache.maven.plugins:maven-par-plugin:par - - - org.apache.maven.plugins:maven-install-plugin:2.3.1:install - - - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy - - - - - - - diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml new file mode 100644 index 0000000000..8dc69806eb --- /dev/null +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -0,0 +1,399 @@ + + + + + + + + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + pom + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + default + + + + org.apache.maven.plugins:maven-install-plugin:2.3.1:install + + + org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + + + + + + + + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + jar + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + default + + + + org.apache.maven.plugins:maven-resources-plugin:2.5:resources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + + + org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + + + org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + + + org.apache.maven.plugins:maven-jar-plugin:2.3.2:jar + + + org.apache.maven.plugins:maven-install-plugin:2.3.1:install + + + org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + + + + + + + + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + ejb + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + default + + + + org.apache.maven.plugins:maven-resources-plugin:2.5:resources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + + + org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + + + org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + + + org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb + + + org.apache.maven.plugins:maven-install-plugin:2.3.1:install + + + org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + + + + + + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + ejb3 + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + default + + + + org.apache.maven.plugins:maven-resources-plugin:2.5:resources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + + + org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + + + org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + + + org.apache.maven.plugins:maven-ejb3-plugin:ejb3 + + + org.apache.maven.plugins:maven-install-plugin:2.3.1:install + + + org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + + + + + + + + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + maven-plugin + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + default + + + + org.apache.maven.plugins:maven-plugin-plugin:2.9:descriptor + + + org.apache.maven.plugins:maven-resources-plugin:2.5:resources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + + + org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + + + org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + + + org.apache.maven.plugins:maven-jar-plugin:2.3.1:jar, + org.apache.maven.plugins:maven-plugin-plugin:2.9:addPluginArtifactMetadata + + + org.apache.maven.plugins:maven-install-plugin:2.3.1:install + + + org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + + + + + + + + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + war + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + default + + + + org.apache.maven.plugins:maven-resources-plugin:2.5:resources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + + + org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + + + org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + + + org.apache.maven.plugins:maven-war-plugin:2.1.1:war + + + org.apache.maven.plugins:maven-install-plugin:2.3.1:install + + + org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + + + + + + + + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + ear + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + default + + + + org.apache.maven.plugins:maven-ear-plugin:2.5:generate-application-xml + + + org.apache.maven.plugins:maven-resources-plugin:2.4.3:resources + + + org.apache.maven.plugins:maven-ear-plugin:2.6:ear + + + org.apache.maven.plugins:maven-install-plugin:2.3.1:install + + + org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + + + + + + + + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + rar + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + default + + + + org.apache.maven.plugins:maven-resources-plugin:2.5:resources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + + + org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + + + org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + + + org.apache.maven.plugins:maven-rar-plugin:2.2:rar + + + org.apache.maven.plugins:maven-install-plugin:2.3.1:install + + + org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + + + + + + + + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + par + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + default + + + + org.apache.maven.plugins:maven-resources-plugin:2.5:resources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + + + org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + + + org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + + + org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + + + org.apache.maven.plugins:maven-par-plugin:par + + + org.apache.maven.plugins:maven-install-plugin:2.3.1:install + + + org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + + + + + + + + + diff --git a/maven-core/src/site/apt/default-bindings.apt.vm b/maven-core/src/site/apt/default-bindings.apt.vm index 91291dd13e..a75eed7d28 100644 --- a/maven-core/src/site/apt/default-bindings.apt.vm +++ b/maven-core/src/site/apt/default-bindings.apt.vm @@ -15,37 +15,37 @@ Plugin Bindings for <<>> Lifecycle Reference * Plugin bindings for <<>> packaging -%{snippet|id=pom-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml} +%{snippet|id=pom-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml} * Plugin bindings for <<>> packaging -%{snippet|id=jar-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml} +%{snippet|id=jar-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml} * Plugin bindings for <<>> packaging -%{snippet|id=ejb-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml} +%{snippet|id=ejb-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml} * Plugin bindings for <<>> packaging -%{snippet|id=ejb3-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml} +%{snippet|id=ejb3-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml} * Plugin bindings for <<>> packaging -%{snippet|id=maven-plugin-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml} +%{snippet|id=maven-plugin-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml} * Plugin bindings for <<>> packaging -%{snippet|id=war-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml} +%{snippet|id=war-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml} * Plugin bindings for <<>> packaging -%{snippet|id=ear-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml} +%{snippet|id=ear-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml} * Plugin bindings for <<>> packaging -%{snippet|id=rar-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml} +%{snippet|id=rar-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml} * Plugin bindings for <<>> packaging -%{snippet|id=par-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/artifact-handlers.xml} +%{snippet|id=par-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml} \ No newline at end of file