Repository: maven Updated Branches: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER 1eff29a2f -> 47511146b (forced update)
[MNG-6169] Lifecycle/binding plugin version updates Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/47511146 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/47511146 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/47511146 Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER Commit: 47511146bce37dd41b6d7c0845e994f20604eb04 Parents: 87cf1ee Author: Christian Schulte <cschu...@apache.org> Authored: Sat Feb 11 19:19:35 2017 +0100 Committer: Michael Osipov <micha...@apache.org> Committed: Thu May 11 19:17:10 2017 +0200 ---------------------------------------------------------------------- .../resources/META-INF/plexus/components.xml | 7 +- .../META-INF/plexus/default-bindings.xml | 95 ++++++++++---------- 2 files changed, 53 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/47511146/maven-core/src/main/resources/META-INF/plexus/components.xml ---------------------------------------------------------------------- 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 3f099cb..ff41c8a 100644 --- a/maven-core/src/main/resources/META-INF/plexus/components.xml +++ b/maven-core/src/main/resources/META-INF/plexus/components.xml @@ -77,8 +77,9 @@ under the License. <phase>post-clean</phase> </phases> <default-phases> + <!-- DO NOT upgrade to 3.0.0 or newer, SUREFIRE-722 fails repeatedly on FreeBSD --> <clean> - org.apache.maven.plugins:maven-clean-plugin:2.5:clean + org.apache.maven.plugins:maven-clean-plugin:2.6.1:clean </clean> </default-phases> <!-- END SNIPPET: clean --> @@ -101,10 +102,10 @@ under the License. </phases> <default-phases> <site> - org.apache.maven.plugins:maven-site-plugin:3.3:site + org.apache.maven.plugins:maven-site-plugin:3.6:site </site> <site-deploy> - org.apache.maven.plugins:maven-site-plugin:3.3:deploy + org.apache.maven.plugins:maven-site-plugin:3.6:deploy </site-deploy> </default-phases> <!-- END SNIPPET: site --> http://git-wip-us.apache.org/repos/asf/maven/blob/47511146/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml ---------------------------------------------------------------------- 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 index 4a303db..8e7acca 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -41,10 +41,10 @@ Mappings to default lifecycle, specific for each packaging. <!-- START SNIPPET: pom-lifecycle --> <phases> <install> - org.apache.maven.plugins:maven-install-plugin:2.4:install + org.apache.maven.plugins:maven-install-plugin:2.5.2:install </install> <deploy> - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy </deploy> </phases> <!-- END SNIPPET: pom-lifecycle --> @@ -67,28 +67,28 @@ Mappings to default lifecycle, specific for each packaging. <!-- START SNIPPET: jar-lifecycle --> <phases> <process-resources> - org.apache.maven.plugins:maven-resources-plugin:2.6:resources + org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources </process-resources> <compile> - org.apache.maven.plugins:maven-compiler-plugin:3.1:compile + org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile </compile> <process-test-resources> - org.apache.maven.plugins:maven-resources-plugin:2.6:testResources + org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources </process-test-resources> <test-compile> - org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile + org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile </test-compile> <test> - org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test + org.apache.maven.plugins:maven-surefire-plugin:2.20:test </test> <package> - org.apache.maven.plugins:maven-jar-plugin:2.4:jar + org.apache.maven.plugins:maven-jar-plugin:3.0.2:jar </package> <install> - org.apache.maven.plugins:maven-install-plugin:2.4:install + org.apache.maven.plugins:maven-install-plugin:2.5.2:install </install> <deploy> - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy </deploy> </phases> <!-- END SNIPPET: jar-lifecycle --> @@ -111,28 +111,28 @@ Mappings to default lifecycle, specific for each packaging. <!-- START SNIPPET: ejb-lifecycle --> <phases> <process-resources> - org.apache.maven.plugins:maven-resources-plugin:2.6:resources + org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources </process-resources> <compile> - org.apache.maven.plugins:maven-compiler-plugin:3.1:compile + org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile </compile> <process-test-resources> - org.apache.maven.plugins:maven-resources-plugin:2.6:testResources + org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources </process-test-resources> <test-compile> - org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile + org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile </test-compile> <test> - org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test + org.apache.maven.plugins:maven-surefire-plugin:2.20:test </test> <package> - org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb + org.apache.maven.plugins:maven-ejb-plugin:2.5.1:ejb </package> <install> - org.apache.maven.plugins:maven-install-plugin:2.4:install + org.apache.maven.plugins:maven-install-plugin:2.5.2:install </install> <deploy> - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy </deploy> </phases> <!-- END SNIPPET: ejb-lifecycle --> @@ -155,32 +155,35 @@ Mappings to default lifecycle, specific for each packaging. <!-- START SNIPPET: maven-plugin-lifecycle --> <phases> <process-resources> - org.apache.maven.plugins:maven-resources-plugin:2.6:resources + org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources </process-resources> + <!-- Do not update, several ITs fail! --> <compile> org.apache.maven.plugins:maven-compiler-plugin:3.1:compile </compile> <process-classes> - org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor + org.apache.maven.plugins:maven-plugin-plugin:3.3:descriptor </process-classes> <process-test-resources> - org.apache.maven.plugins:maven-resources-plugin:2.6:testResources + org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources </process-test-resources> + <!-- Do not update, several ITs fail! --> <test-compile> org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile </test-compile> <test> - org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test + org.apache.maven.plugins:maven-surefire-plugin:2.20:test </test> + <!-- Do not update, several ITs fail! --> <package> org.apache.maven.plugins:maven-jar-plugin:2.4:jar, - org.apache.maven.plugins:maven-plugin-plugin:3.2:addPluginArtifactMetadata + org.apache.maven.plugins:maven-plugin-plugin:3.3:addPluginArtifactMetadata </package> <install> - org.apache.maven.plugins:maven-install-plugin:2.4:install + org.apache.maven.plugins:maven-install-plugin:2.5.2:install </install> <deploy> - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy </deploy> </phases> <!-- END SNIPPET: maven-plugin-lifecycle --> @@ -203,28 +206,28 @@ Mappings to default lifecycle, specific for each packaging. <!-- START SNIPPET: war-lifecycle --> <phases> <process-resources> - org.apache.maven.plugins:maven-resources-plugin:2.6:resources + org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources </process-resources> <compile> - org.apache.maven.plugins:maven-compiler-plugin:3.1:compile + org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile </compile> <process-test-resources> - org.apache.maven.plugins:maven-resources-plugin:2.6:testResources + org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources </process-test-resources> <test-compile> - org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile + org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile </test-compile> <test> - org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test + org.apache.maven.plugins:maven-surefire-plugin:2.20:test </test> <package> - org.apache.maven.plugins:maven-war-plugin:2.2:war + org.apache.maven.plugins:maven-war-plugin:3.0.0:war </package> <install> - org.apache.maven.plugins:maven-install-plugin:2.4:install + org.apache.maven.plugins:maven-install-plugin:2.5.2:install </install> <deploy> - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy </deploy> </phases> <!-- END SNIPPET: war-lifecycle --> @@ -247,19 +250,19 @@ Mappings to default lifecycle, specific for each packaging. <!-- START SNIPPET: ear-lifecycle --> <phases> <generate-resources> - org.apache.maven.plugins:maven-ear-plugin:2.8:generate-application-xml + org.apache.maven.plugins:maven-ear-plugin:2.9.1:generate-application-xml </generate-resources> <process-resources> - org.apache.maven.plugins:maven-resources-plugin:2.6:resources + org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources </process-resources> <package> - org.apache.maven.plugins:maven-ear-plugin:2.8:ear + org.apache.maven.plugins:maven-ear-plugin:2.9.1:ear </package> <install> - org.apache.maven.plugins:maven-install-plugin:2.4:install + org.apache.maven.plugins:maven-install-plugin:2.5.2:install </install> <deploy> - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy </deploy> </phases> <!-- END SNIPPET: ear-lifecycle --> @@ -282,28 +285,28 @@ Mappings to default lifecycle, specific for each packaging. <!-- START SNIPPET: rar-lifecycle --> <phases> <process-resources> - org.apache.maven.plugins:maven-resources-plugin:2.6:resources + org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources </process-resources> <compile> - org.apache.maven.plugins:maven-compiler-plugin:3.1:compile + org.apache.maven.plugins:maven-compiler-plugin:3.6.1:compile </compile> <process-test-resources> - org.apache.maven.plugins:maven-resources-plugin:2.6:testResources + org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources </process-test-resources> <test-compile> - org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile + org.apache.maven.plugins:maven-compiler-plugin:3.6.1:testCompile </test-compile> <test> - org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test + org.apache.maven.plugins:maven-surefire-plugin:2.20:test </test> <package> - org.apache.maven.plugins:maven-rar-plugin:2.2:rar + org.apache.maven.plugins:maven-rar-plugin:2.4:rar </package> <install> - org.apache.maven.plugins:maven-install-plugin:2.4:install + org.apache.maven.plugins:maven-install-plugin:2.5.2:install </install> <deploy> - org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy + org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy </deploy> </phases> <!-- END SNIPPET: rar-lifecycle -->