Author: hboutemy
Date: Mon Apr 20 20:43:20 2009
New Revision: 766862
URL: http://svn.apache.org/viewvc?rev=766862&view=rev
Log:
renamed tokens used during bootstrap to better understand their role
Modified:
maven/components/trunk/README.bootstrap.txt
maven/components/trunk/build-mercury.xml
maven/components/trunk/build.xml
maven/components/trunk/pom.xml
Modified: maven/components/trunk/README.bootstrap.txt
URL:
http://svn.apache.org/viewvc/maven/components/trunk/README.bootstrap.txt?rev=766862&r1=766861&r2=766862&view=diff
==============================================================================
--- maven/components/trunk/README.bootstrap.txt (original)
+++ maven/components/trunk/README.bootstrap.txt Mon Apr 20 20:43:20 2009
@@ -8,7 +8,7 @@
First, give Ant a location into which the completed Maven distro should be
installed:
- export M2_HOME=$HOME/apps/maven/apache-maven-2.1-SNAPSHOT
+ export M2_HOME=$HOME/apps/maven/apache-maven-3.0-SNAPSHOT
Then, run Ant:
Modified: maven/components/trunk/build-mercury.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build-mercury.xml?rev=766862&r1=766861&r2=766862&view=diff
==============================================================================
--- maven/components/trunk/build-mercury.xml (original)
+++ maven/components/trunk/build-mercury.xml Mon Apr 20 20:43:20 2009
@@ -71,9 +71,9 @@
<property name="maven.repo.update.policy" value="always"/>
-->
<property name="maven.repo.update.policy" value="daily"/>
-
+
<property name="maven.repo.system" value="don.t"/>
-
+
<condition property="do.not.clean.local.repo">
<not>
<isset property="clean.local.repo"/>
@@ -110,13 +110,13 @@
<replacefilter token='@Component( role = RepositorySystem.class, hint =
"default" )'
value='@Component( role = RepositorySystem.class, hint =
"${mercury-hint}" )'/>
</replace>
-
+
<echo>maven.repo.system is ${maven.repo.system}, flip:
legacy-hint=${legacy-hint}, mercury-hint=${mercury-hint}</echo>
</target>
<target name="flip-default-repository-system" description="flips repository
system impl">
-
+
<condition property="legacy-hint" value="default">
<equals arg1="${maven.repo.system}" arg2="legacy"/>
</condition>
@@ -130,11 +130,11 @@
<condition property="mercury-hint" value="default">
<equals arg1="${maven.repo.system}" arg2="mercury"/>
</condition>
-
+
<condition property="do.not.flip.repository" value="default">
<equals arg1="${maven.repo.system}" arg2="don.t"/>
</condition>
-
+
<antcall target="flip-default-repository"/>
</target>
@@ -143,8 +143,8 @@
<property name="verbose" value="false"/>
<!-- Pull the dependencies that Maven needs to build -->
<copy file="pom.xml" tofile="dependencies.xml"/>
- <replace file="${basedir}/dependencies.xml" token="<!--start-->"
value="<!--"/>
- <replace file="${basedir}/dependencies.xml" token="<!--end-->"
value="-->"/>
+ <replace file="${basedir}/dependencies.xml"
token="<!--bootstrap-start-comment-->" value="<!--"/>
+ <replace file="${basedir}/dependencies.xml"
token="<!--bootstrap-end-comment-->" value="-->"/>
<mercury:local-repository location="${maven.repo.local}"/>
<mercury:remote-repository id="central" location="${maven.repo.central}"
updatePolicy="${maven.repo.update.policy}"/>
Modified: maven/components/trunk/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=766862&r1=766861&r2=766862&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Mon Apr 20 20:43:20 2009
@@ -78,8 +78,8 @@
<property name="verbose" value="false"/>
<!-- Pull the dependencies that Maven needs to build -->
<copy file="pom.xml" tofile="dependencies.xml"/>
- <replace file="${basedir}/dependencies.xml" token="<!--start-->"
value="<!--"/>
- <replace file="${basedir}/dependencies.xml" token="<!--end-->"
value="-->"/>
+ <replace file="${basedir}/dependencies.xml"
token="<!--bootstrap-start-comment-->" value="<!--"/>
+ <replace file="${basedir}/dependencies.xml"
token="<!--bootstrap-end-comment-->" value="-->"/>
<artifact:pom file="${basedir}/dependencies.xml" id="pom"/>
<artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset"
verbose="${verbose}" useScope="compile">
<localRepository path="${maven.repo.local}"/>
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=766862&r1=766861&r2=766862&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Mon Apr 20 20:43:20 2009
@@ -182,13 +182,13 @@
<jxpathVersion>1.3</jxpathVersion>
<staxVersion>1.0.1</staxVersion>
</properties>
-
- <!--start-->
+
+ <!--bootstrap-start-comment-->
<dependencyManagement>
- <!--end-->
+ <!--bootstrap-end-comment-->
<dependencies>
<!-- Maven Modules -->
- <!--start-->
+ <!--bootstrap-start-comment-->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-mercury</artifactId>
@@ -254,7 +254,7 @@
<artifactId>maven-compat</artifactId>
<version>${project.version}</version>
</dependency>
- <!--end-->
+ <!--bootstrap-end-comment-->
<!-- Plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -453,19 +453,19 @@
<artifactId>plexus-plugin-manager</artifactId>
<version>${plexusPluginManagerVersion}</version>
</dependency>
- <!--start-->
+ <!--bootstrap-start-comment-->
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easyMockVersion}</version>
<scope>test</scope>
</dependency>
- <!--end-->
+ <!--bootstrap-end-comment-->
</dependencies>
- <!--start-->
+ <!--bootstrap-start-comment-->
</dependencyManagement>
- <!--end-->
- <!--start-->
+ <!--bootstrap-end-comment-->
+ <!--bootstrap-start-comment-->
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -474,7 +474,7 @@
<scope>test</scope>
</dependency>
</dependencies>
- <!--end-->
+ <!--bootstrap-end-comment-->
<build>
<pluginManagement>
