You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/09/05 13:52:59 UTC
svn commit: r811624 - in /maven/site/trunk/src/site:
apt/guides/introduction/introduction-to-the-lifecycle.apt apt/pom.apt
xdoc/source-repository.xml
Author: bentmann
Date: Sat Sep 5 11:52:59 2009
New Revision: 811624
URL: http://svn.apache.org/viewvc?rev=811624&view=rev
Log:
o Updated URLs to Maven 3 trunk due to r811356
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt
maven/site/trunk/src/site/apt/pom.apt
maven/site/trunk/src/site/xdoc/source-repository.xml
Modified: maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt?rev=811624&r1=811623&r2=811624&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt (original)
+++ maven/site/trunk/src/site/apt/guides/introduction/introduction-to-the-lifecycle.apt Sat Sep 5 11:52:59 2009
@@ -430,6 +430,6 @@
The full Maven lifecycle is defined by the file <<<components.xml>>> in the module <<<maven-core>>> and viewable from SVN in the branches for
{{{http://svn.apache.org/repos/asf/maven/maven-2/tags/maven-2.2.0/maven-core/src/main/resources/META-INF/plexus/components.xml}Maven 2.2.0}}
- and {{{http://svn.apache.org/repos/asf/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml}Maven 3.0.x}}.
+ and {{{http://svn.apache.org/repos/asf/maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml}Maven 3.0.x}}.
<{{{./introduction-to-the-lifecycle.html}[top]}}.>
Modified: maven/site/trunk/src/site/apt/pom.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/pom.apt?rev=811624&r1=811623&r2=811624&view=diff
==============================================================================
--- maven/site/trunk/src/site/apt/pom.apt (original)
+++ maven/site/trunk/src/site/apt/pom.apt Sat Sep 5 11:52:59 2009
@@ -543,7 +543,7 @@
such that dependencies are always build before dependent modules.
To see aggregation in action, just have a look at the
- {{{http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?view=markup}Maven}} or
+ {{{http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?view=markup}Maven}} or
{{{http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?view=markup}Maven Core Plugins}} base POM's.
*** A final note on {Inheritance v}. Aggregation
@@ -551,7 +551,7 @@
Inheritance and aggregation create a nice dynamic to control builds through a single,
high-level POM. You will often see projects that are both parents and aggregators.
For example, the entire maven core runs through a single base POM
- {{{http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?view=markup}<<<org.apache.maven:maven>>>}},
+ {{{http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?view=markup}<<<org.apache.maven:maven>>>}},
so building the Maven project can be executed by a single command: <<<mvn compile>>>.
However, although both POM projects, an aggregator project and a parent project are not
one in the same and should not be confused. A POM project may be inherited from - but does
Modified: maven/site/trunk/src/site/xdoc/source-repository.xml
URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/xdoc/source-repository.xml?rev=811624&r1=811623&r2=811624&view=diff
==============================================================================
--- maven/site/trunk/src/site/xdoc/source-repository.xml (original)
+++ maven/site/trunk/src/site/xdoc/source-repository.xml Sat Sep 5 11:52:59 2009
@@ -40,7 +40,7 @@
</p>
<source>
<a href="http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x">http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x</a> <!-- protected space to force line break -->
-<a href="http://svn.apache.org/viewvc/maven/components/trunk">http://svn.apache.org/viewvc/maven/components/trunk</a></source>
+<a href="http://svn.apache.org/viewvc/maven/maven-3/trunk">http://svn.apache.org/viewvc/maven/maven-3/trunk</a></source>
<p>
The source repositories for the various plugins are listed in the documentation of the respective plugin,
reachable via the <a href="plugins/index.html">plugin index</a>.
@@ -53,7 +53,7 @@
</p>
<source>
$ svn checkout http://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x maven-2.2.x
-$ svn checkout http://svn.apache.org/repos/asf/maven/components/trunk maven-3</source>
+$ svn checkout http://svn.apache.org/repos/asf/maven/maven-3/trunk maven-3</source>
</subsection>
<subsection name="Developer Access">
<p>
@@ -62,7 +62,7 @@
</p>
<source>
$ svn checkout https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x maven-2.2.x
-$ svn checkout https://svn.apache.org/repos/asf/maven/components/trunk maven-3</source>
+$ svn checkout https://svn.apache.org/repos/asf/maven/maven-3/trunk maven-3</source>
<p>
To commit changes to the repository, execute the following command to commit your changes (<code>svn</code> will
prompt you for your password):
@@ -77,7 +77,7 @@
</p>
<source>
$ svn checkout https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x maven-2.2.x
-$ svn checkout https://svn.apache.org/repos/asf/maven/components/trunk maven-3</source>
+$ svn checkout https://svn.apache.org/repos/asf/maven/maven-3/trunk maven-3</source>
</subsection>
<subsection name="Access through a Proxy">
<p>