From a5b167db4522465b17794577ea6c3bbd0e4f6425 Mon Sep 17 00:00:00 2001 From: Vincent Siveton Date: Thu, 14 Aug 2008 11:35:08 +0000 Subject: [PATCH] [maven-release-plugin] copy for tag maven-plugin-tools-2.4.3 git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3@685859 13f79535-47bb-0310-9956-ffa450edef68 --- maven-plugin-plugin/pom.xml | 34 +++--- .../plugin/DescriptorGeneratorMojo.java | 2 +- .../site/apt/examples/generate-descriptor.apt | 5 +- .../src/site/apt/examples/generate-help.apt | 5 +- .../src/site/apt/examples/generate-report.apt | 5 +- maven-plugin-plugin/src/site/apt/index.apt | 5 +- .../site/apt/multiple-language-support.apt | 21 ++-- maven-plugin-plugin/src/site/apt/usage.apt | 5 +- maven-plugin-tools-ant/pom.xml | 15 +-- maven-plugin-tools-api/pom.xml | 15 +-- maven-plugin-tools-beanshell/pom.xml | 15 +-- maven-plugin-tools-java/pom.xml | 15 +-- maven-plugin-tools-javadoc/pom.xml | 29 ++--- maven-plugin-tools-model/pom.xml | 61 +++++----- pom.xml | 110 +++++++++--------- 15 files changed, 178 insertions(+), 164 deletions(-) diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml index b4eaf7d..67947c9 100644 --- a/maven-plugin-plugin/pom.xml +++ b/maven-plugin-plugin/pom.xml @@ -18,33 +18,30 @@ ~ under the License. --> + 4.0.0 + org.apache.maven.plugins maven-plugins 11 - 4.0.0 org.apache.maven.plugins maven-plugin-plugin + 2.4.3 maven-plugin - Maven Plugin Plugin - 2.4.3-SNAPSHOT + Maven Plugin Plugin The Plugin Plugin is used to create a Maven plugin descriptor for any Mojo's found in the source tree, to include in the JAR. It is also used to generate Xdoc files for the Mojos as well as for updating the plugin registry, the artifact metadata and a generic help goal. - - 2.0.6 - - - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin/ - http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-plugin + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-plugin + http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-plugin jira @@ -57,6 +54,16 @@ + + 2.0.6 + + + + 1.0-alpha-10 + 1.0-alpha-10 + 2.4.3 + + @@ -96,12 +103,6 @@ - - 1.0-alpha-10 - 1.0-alpha-10 - 2.4.3-SNAPSHOT - - @@ -285,6 +286,7 @@ true Closed Type,Key + 13021 diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java index 7a6d884..d6f3abb 100644 --- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java +++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java @@ -26,7 +26,7 @@ import java.io.File; /** * Generate a plugin descriptor. - *

+ *
* Note: Phase is after the "compilation" of any scripts. * * @author Jason van Zyl diff --git a/maven-plugin-plugin/src/site/apt/examples/generate-descriptor.apt b/maven-plugin-plugin/src/site/apt/examples/generate-descriptor.apt index 71bb8c7..7b639f8 100644 --- a/maven-plugin-plugin/src/site/apt/examples/generate-descriptor.apt +++ b/maven-plugin-plugin/src/site/apt/examples/generate-descriptor.apt @@ -3,7 +3,7 @@ ------ Maria Odea Ching ------ - February 2008 + 2008-02-01 ------ ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -23,6 +23,9 @@ ~~ specific language governing permissions and limitations ~~ under the License. +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + Configuring Generation of Plugin Descriptor To configure the generation of the plugin descriptor, add the following to the project's POM: diff --git a/maven-plugin-plugin/src/site/apt/examples/generate-help.apt b/maven-plugin-plugin/src/site/apt/examples/generate-help.apt index 1525674..04de885 100644 --- a/maven-plugin-plugin/src/site/apt/examples/generate-help.apt +++ b/maven-plugin-plugin/src/site/apt/examples/generate-help.apt @@ -3,7 +3,7 @@ ------ Vincent Siveton ------ - January 2008 + 2008-01-01 ------ ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -23,6 +23,9 @@ ~~ specific language governing permissions and limitations ~~ under the License. +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + Configuring Generation of Help Mojo To configure the generation of a <<>> Mojo, add the following to the project's POM: diff --git a/maven-plugin-plugin/src/site/apt/examples/generate-report.apt b/maven-plugin-plugin/src/site/apt/examples/generate-report.apt index edbd88c..0de809b 100644 --- a/maven-plugin-plugin/src/site/apt/examples/generate-report.apt +++ b/maven-plugin-plugin/src/site/apt/examples/generate-report.apt @@ -3,7 +3,7 @@ ------ Vincent Siveton ------ - January 2008 + 2008-01-01 ------ ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -23,6 +23,9 @@ ~~ specific language governing permissions and limitations ~~ under the License. +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + Configuring Generation of Documentation Reports To configure the generation of the documentation reports, add the following to the project's POM: diff --git a/maven-plugin-plugin/src/site/apt/index.apt b/maven-plugin-plugin/src/site/apt/index.apt index b0bc4dd..3c0391d 100644 --- a/maven-plugin-plugin/src/site/apt/index.apt +++ b/maven-plugin-plugin/src/site/apt/index.apt @@ -3,7 +3,7 @@ ------ Maria Odea Ching ------ - January 2008 + 2008-01-01 ------ ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -23,6 +23,9 @@ ~~ specific language governing permissions and limitations ~~ under the License. +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + Maven Plugin Plugin The Maven Plugin Plugin is used to create a Maven plugin descriptor for any diff --git a/maven-plugin-plugin/src/site/apt/multiple-language-support.apt b/maven-plugin-plugin/src/site/apt/multiple-language-support.apt index a041ac9..43e66e5 100644 --- a/maven-plugin-plugin/src/site/apt/multiple-language-support.apt +++ b/maven-plugin-plugin/src/site/apt/multiple-language-support.apt @@ -3,9 +3,9 @@ --- John Casey --- - 09-Feb-2005 + 2005-02-09 --- - + ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file ~~ distributed with this work for additional information @@ -23,28 +23,31 @@ ~~ specific language governing permissions and limitations ~~ under the License. +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + <> - + *Abstract The Plugin Plugin needs to be refactored in order to support multiple mojo - implementation languages. This document will detail the steps needed to + implementation languages. This document will detail the steps needed to add this functionality. - + *Current Status The Plugin Plugin currently calls out to a set of generators in the maven-plugin-tools library, which in turn uses QDox to generate various things based on annotations in the java source code. - + *Refactored Design The new design will have a generator-manager which is a component that the - plugin mojos will lookup. This component will have access to a mapping of all + plugin mojos will lookup. This component will have access to a mapping of all generators and the language they're registered for. It'll iterate through the mappings, and extract mojo descriptors from all relevant scripts/sources using each language's registered generator. Results from each generator will be - centrally aggregated by the generator-manager. After all generators have run, + centrally aggregated by the generator-manager. After all generators have run, the generator-manager will call another class (depending on what it's meant to - produce) to take all the aggregated mojo descriptors and produce a result + produce) to take all the aggregated mojo descriptors and produce a result (such as <<>> file for the project). \ No newline at end of file diff --git a/maven-plugin-plugin/src/site/apt/usage.apt b/maven-plugin-plugin/src/site/apt/usage.apt index 681e74d..4957947 100644 --- a/maven-plugin-plugin/src/site/apt/usage.apt +++ b/maven-plugin-plugin/src/site/apt/usage.apt @@ -4,7 +4,7 @@ Maria Odea Ching Vincent Siveton ------ - January 2008 + 2008-01-01 ------ ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -24,6 +24,9 @@ ~~ specific language governing permissions and limitations ~~ under the License. +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + Usage The Plugin Plugin is generally used for Maven 2 plugins. Its goals are bound to different phases in the build life cycle. diff --git a/maven-plugin-tools-ant/pom.xml b/maven-plugin-tools-ant/pom.xml index 7f3dcfb..4320db1 100644 --- a/maven-plugin-tools-ant/pom.xml +++ b/maven-plugin-tools-ant/pom.xml @@ -25,13 +25,20 @@ org.apache.maven.plugin-tools maven-plugin-tools - 2.4.3-SNAPSHOT + 2.4.3 maven-plugin-tools-ant + Maven Plugin Tool for Ant Descriptor extractor for plugins written in Ant. + + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-ant + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-ant + http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-ant + + @@ -53,10 +60,4 @@ plexus-utils - - - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/ - http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/ - diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml index 6d3b8a8..3162375 100644 --- a/maven-plugin-tools-api/pom.xml +++ b/maven-plugin-tools-api/pom.xml @@ -25,13 +25,20 @@ org.apache.maven.plugin-tools maven-plugin-tools - 2.4.3-SNAPSHOT + 2.4.3 maven-plugin-tools-api + Maven Plugin Tools APIs The Maven Plugin Tools API provides an API to extract information from and generate documentation for Maven Plugins. + + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-api + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-api + http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-api + + @@ -102,12 +109,6 @@ - - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/ - http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/ - - reporting diff --git a/maven-plugin-tools-beanshell/pom.xml b/maven-plugin-tools-beanshell/pom.xml index 0606496..c9410dd 100644 --- a/maven-plugin-tools-beanshell/pom.xml +++ b/maven-plugin-tools-beanshell/pom.xml @@ -25,13 +25,20 @@ org.apache.maven.plugin-tools maven-plugin-tools - 2.4.3-SNAPSHOT + 2.4.3 maven-plugin-tools-beanshell + Maven Plugin Tool for Beanshell Descriptor extractor for plugins written in Beanshell. + + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-beanshell + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-beanshell + http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-beanshell + + @@ -50,10 +57,4 @@ 1.3.0 - - - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/ - http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/ - diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml index 7d01130..7fd1307 100644 --- a/maven-plugin-tools-java/pom.xml +++ b/maven-plugin-tools-java/pom.xml @@ -25,13 +25,20 @@ org.apache.maven.plugin-tools maven-plugin-tools - 2.4.3-SNAPSHOT + 2.4.3 maven-plugin-tools-java + Maven Plugin Tool for Java Descriptor extractor for plugins written in Java. + + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-java + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-java + http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-java + + @@ -70,10 +77,4 @@ 1.6.3 - - - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-java/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-java/ - http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/ - diff --git a/maven-plugin-tools-javadoc/pom.xml b/maven-plugin-tools-javadoc/pom.xml index cb9c468..eac5204 100644 --- a/maven-plugin-tools-javadoc/pom.xml +++ b/maven-plugin-tools-javadoc/pom.xml @@ -25,13 +25,21 @@ org.apache.maven.plugin-tools maven-plugin-tools - 2.4.3-SNAPSHOT + 2.4.3 maven-plugin-tools-javadoc + Maven Plugin Tools Javadoc + The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when generating Javadoc. 2008 + + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-javadoc + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-javadoc + http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-javadoc + + org.apache.maven.plugin-tools @@ -39,17 +47,6 @@ - - - - maven-javadoc-plugin - - - maven-jxr-plugin - - - - default-tools.jar @@ -70,7 +67,7 @@ - integration-tests + unit-tests maven.test.skip @@ -168,10 +165,4 @@ - - - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/ - http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/ - diff --git a/maven-plugin-tools-model/pom.xml b/maven-plugin-tools-model/pom.xml index 2ff50ef..a1bbc45 100644 --- a/maven-plugin-tools-model/pom.xml +++ b/maven-plugin-tools-model/pom.xml @@ -1,4 +1,4 @@ - + +--> 4.0.0 @@ -25,19 +25,44 @@ org.apache.maven.plugin-tools maven-plugin-tools - 2.4.3-SNAPSHOT + 2.4.3 maven-plugin-tools-model + Maven Plugin Metadata Model - The Maven Plugin Metadata Model provides an API to play with the Metadat model. + The Maven Plugin Metadata Model provides an API to play with the Metadata model. + + + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-model + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-model + http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-model + + + + + + org.apache.maven + maven-plugin-descriptor + + + + + org.codehaus.plexus + plexus-utils + + + org.codehaus.plexus + plexus-container-default + + org.codehaus.modello modello-maven-plugin - 1.0-alpha-21 + 1.0-alpha-21 src/main/mdo/plugin-metadata.mdo @@ -49,7 +74,7 @@ site-docs pre-site - xsd + xdoc @@ -74,28 +99,4 @@ - - - - - org.apache.maven - maven-plugin-descriptor - - - - - org.codehaus.plexus - plexus-utils - - - org.codehaus.plexus - plexus-container-default - - - - - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-model/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-model/ - http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-model/ - diff --git a/pom.xml b/pom.xml index 4b773ba..5cb2b84 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 2.4.3-SNAPSHOT + 2.4.3 pom Maven Plugin Tools @@ -39,21 +39,6 @@ http://maven.apache.org/plugin-tools/ 2004 - - 2.0.6 - - - - jira - http://jira.codehaus.org/browse/MPLUGIN - - - - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk - http://svn.apache.org/viewvc/maven/plugin-tools/trunk - - Maven User List @@ -128,42 +113,9 @@ - - - apache.website - scp://people.apache.org/www/maven.apache.org/plugin-tools/ - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.4 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.4.3 - - - maven-site-plugin - 2.0-beta-7 - - scp://people.apache.org/www/maven.apache.org/plugin-tools/${project.artifactId}-${project.version} - - - - maven-release-plugin - - https://svn.apache.org/repos/asf/maven/plugin-tools/tags - - - - - + + 2.0.6 + maven-plugin-tools-api @@ -175,6 +127,27 @@ maven-plugin-tools-javadoc + + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3 + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3 + http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3 + + + jira + http://jira.codehaus.org/browse/MPLUGIN + + + + apache.website + scp://people.apache.org/www/maven.apache.org/plugin-tools/ + + + + + 2.4.3 + 1.2 + + @@ -235,8 +208,33 @@ - - 2.4.3-SNAPSHOT - 1.2 - + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.4 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.4.3 + + + maven-site-plugin + 2.0-beta-7 + + scp://people.apache.org/www/maven.apache.org/plugin-tools/${project.artifactId}-${project.version} + + + + maven-release-plugin + + https://svn.apache.org/repos/asf/maven/plugin-tools/tags + + + + +