Author: hboutemy Date: Tue Jun 28 19:51:51 2011 New Revision: 1140817 URL: http://svn.apache.org/viewvc?rev=1140817&view=rev Log: [MPOM-7] improved documentation
Modified: maven/pom/trunk/asf/pom.xml maven/pom/trunk/asf/src/site-docs/apt/index.apt maven/pom/trunk/asf/src/site-docs/site.xml Modified: maven/pom/trunk/asf/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1140817&r1=1140816&r2=1140817&view=diff ============================================================================== --- maven/pom/trunk/asf/pom.xml (original) +++ maven/pom/trunk/asf/pom.xml Tue Jun 28 19:51:51 2011 @@ -22,13 +22,7 @@ under the License. <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- Shared parent. Doesn't define a lot of things about Apache like general mailing lists, but does - define the settings common to all projects at Apache - - As of Version 6, this includes a standard release profile that all projects can use. If the profile is not appropriate for your project, define your own release profile and change the release plugin configuration parameter <arguments> </arguments> to activate your profile instead of the apache-release profile. - - Standard versions of plugins are also defined, these may be overridden by individual projects as well. - --> + <!-- for more information, see the documentation of this POM: http://maven.apache.org/pom/asf/ --> <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>10-SNAPSHOT</version> @@ -77,9 +71,6 @@ under the License. </mailingLists> <distributionManagement> - <!-- Site omitted - each project must provide their own --> - <!-- this project *has* a site: http://maven.apache.org/pom/asf/ - but it gets deployed manually to avoid unwanted inheritance. --> <repository> <id>apache.releases.https</id> <name>Apache Release Distribution Repository</name> Modified: maven/pom/trunk/asf/src/site-docs/apt/index.apt URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/src/site-docs/apt/index.apt?rev=1140817&r1=1140816&r2=1140817&view=diff ============================================================================== --- maven/pom/trunk/asf/src/site-docs/apt/index.apt (original) +++ maven/pom/trunk/asf/src/site-docs/apt/index.apt Tue Jun 28 19:51:51 2011 @@ -54,17 +54,14 @@ Apache Software Foundation Parent POM https://repository.apache.org/service/local/staging/deploy/maven2 and snapshots to https://repository.apache.org/content/repositories/snapshots. Note - that there is POM parameters that you can override to change + that there are POM parameters that you can override to change the snapshot location. ** <<mailingLists>>: The POM sets up generic Apache announcement lists. You should override this. - ** <<scm>>: The location <of this POM> in subversion. You must override - this for the release plugin to work correctly. - * <<pluginManagement>>: The plugin management section specifies versions - of a list of plugins. See {{{./plugin-management.html}the report}} on this site for a list with versions. + of a list of plugins. See {{{./plugin-management.html}the Dependencies report}} for a list with versions. ** The compiler plugin is set to default to Java 1.4 and UTF-8 source. @@ -88,7 +85,7 @@ Apache Software Foundation Parent POM The <<<apache-release>>> Profile As noted above, this pom configures the release plugin to enable - the apache-release profile for all executions of the release + the <<<apache-release>>> profile for all executions of the release plugin. The profile includes the following plugins: * maven-assemble-plugin: @@ -105,10 +102,10 @@ The <<<apache-release>>> Profile * maven-javadoc-plugin: configured to build and attach a javadoc jar. * maven-gpg-plugin: configured to sign everything. It expects to find - a passphrase in $\{gpg.passphrase\}, presumably in your settings.xml. + a passphrase in $\{gpg.passphrase\}, presumably in your <<<settings.xml>>>. Settings Configuration You can have a look at the page in Apache website {{{http://www.apache.org/dev/publishing-maven-artifacts.html}Publishing Maven Artifacts}}. - You can test your environment setup using : <<<-Papache-release>>> with the command line. + You can test your environment setup using <<<-Papache-release>>> with the command line. Modified: maven/pom/trunk/asf/src/site-docs/site.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/src/site-docs/site.xml?rev=1140817&r1=1140816&r2=1140817&view=diff ============================================================================== --- maven/pom/trunk/asf/src/site-docs/site.xml (original) +++ maven/pom/trunk/asf/src/site-docs/site.xml Tue Jun 28 19:51:51 2011 @@ -56,12 +56,5 @@ under the License. </breadcrumbs> <menu ref="reports" inherit="bottom" /> - - <menu name="ASF"> - <item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works.html"/> - <item name="Foundation" href="http://www.apache.org/foundation/"/> - <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/> - <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/> - </menu> </body> </project> \ No newline at end of file