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/02/07 11:01:01 UTC
svn commit: r741872 - in /maven/components/branches/maven-2.0.x: ./ build.xml
Author: bentmann
Date: Sat Feb 7 10:01:01 2009
New Revision: 741872
URL: http://svn.apache.org/viewvc?rev=741872&view=rev
Log:
o Enabled exception stack traces for Maven invocations
o Removed superfluos whitespace
o Merged from r741870
Modified:
maven/components/branches/maven-2.0.x/ (props changed)
maven/components/branches/maven-2.0.x/build.xml
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 7 10:01:01 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC:708790-728809,728834
-/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,738723,738753,739385,741507,741518
+/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,738723,738753,739385,741507,741518,741870
/maven/components/trunk:720001,721902,726845,729292
Modified: maven/components/branches/maven-2.0.x/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/build.xml?rev=741872&r1=741871&r2=741872&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/build.xml (original)
+++ maven/components/branches/maven-2.0.x/build.xml Sat Feb 7 10:01:01 2009
@@ -64,7 +64,7 @@
</target>
<target name="init" depends="isMavenHomeSet,initLocalRepo">
- <xmlproperty prefix="pom" file="pom.xml"/>
+ <xmlproperty prefix="pom" file="pom.xml"/>
<basename file="${maven.home}" property="maven.home.basename"/>
<dirname file="${maven.home}" property="maven.home.dirname"/>
<property name="maven.home.basename.expected" value="apache-maven-${pom.project.version}"/>
@@ -74,7 +74,7 @@
<delete dir="bootstrap"/>
</target>
- <target name="pull" depends="init, read-poms" unless="skip.pull">
+ <target name="pull" depends="init, read-poms" unless="skip.pull">
<property name="verbose" value="false"/>
<property name="bootstrap.repository" value="${basedir}/bootstrap-repository"/>
<!-- Pull the dependencies that Maven needs to build -->
@@ -82,16 +82,16 @@
<!--
<localRepository path="${bootstrap.repository}"/>
-->
- <pom refid="pom"/>
- </artifact:dependencies>
+ <pom refid="pom"/>
+ </artifact:dependencies>
<!-- Pull the dependencies for Modello -->
<artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset" verbose="${verbose}">
<!--
<localRepository path="${bootstrap.repository}"/>
-->
- <dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0-alpha-17"/>
- </artifact:dependencies>
+ <dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0-alpha-17"/>
+ </artifact:dependencies>
</target>
<target name="generate-sources" depends="pull" description="generates Java sources from Modello mdo model files">
@@ -174,7 +174,7 @@
</java>
</target>
- <target name="maven-assembly" depends="maven-compile" description="generates the Maven installation assembly using the bootstrap Maven">
+ <target name="maven-assembly" depends="maven-compile" description="generates the Maven installation assembly using the bootstrap Maven">
<echo>
The new Maven distribution was created as part of the MAVEN-COMPILE step, above.
This goal just validates the presence of that distribution.
@@ -190,7 +190,7 @@
<target name="extract-assembly" depends="init,maven-assembly" description="extracts the maven assembly into maven.home">
<echo>Extracting assembly to ${maven.home.dirname} ...</echo>
- <!-- Deleting the contents inside maven.home allow one to use symlinks for maven.home and still have this work. -->
+ <!-- Deleting the contents inside maven.home allow one to use symlinks for maven.home and still have this work. -->
<mkdir dir="${maven.home}"/>
<delete includeemptydirs="true">
<fileset dir="${maven.home}">
@@ -227,6 +227,7 @@
<env key="M2_HOME" value="${maven.home}"/>
<arg value="/c"/>
<arg value="${maven.home}\bin\mvn.bat"/>
+ <arg value="-e"/>
<arg value="-B"/>
<arg value="process-resources"/>
</exec>
@@ -235,6 +236,7 @@
<env key="M2_HOME" value="${maven.home}"/>
<arg value="/c"/>
<arg value="${maven.home}\bin\mvn.bat"/>
+ <arg value="-e"/>
<arg value="-B"/>
<arg value="package"/>
</exec>
@@ -246,6 +248,7 @@
<arg value="/c"/>
<arg value="${maven.home}\bin\mvn.bat"/>
<arg value="-Prun-its"/>
+ <arg value="-e"/>
<arg value="-B"/>
<arg value="clean"/>
<arg value="install"/>
@@ -256,21 +259,22 @@
<echo>Retrieving integration tests</echo>
<exec failonerror="true" dir="${basedir}/${itPom.artifactId}" executable="${maven.home}/bin/mvn">
<env key="M2_HOME" value="${maven.home}"/>
+ <arg value="-e"/>
<arg value="-B"/>
<arg value="process-resources"/>
</exec>
<exec failonerror="true" dir="${basedir}/${itPom.artifactId}/target/classes" executable="${maven.home}/bin/mvn">
<env key="M2_HOME" value="${maven.home}"/>
+ <arg value="-e"/>
<arg value="-B"/>
<arg value="package"/>
</exec>
<echo>Running integration tests</echo>
- <echo>maven.home is: ${maven.home}</echo>
- <!-- Using java.io.tmpdir to avoid long path names that will make windows scream. -->
<exec failonerror="true" dir="${java.io.tmpdir}/${itPom.artifactId}-${itPom.version}" executable="${maven.home}/bin/mvn">
<env key="M2_HOME" value="${maven.home}"/>
<arg value="-Prun-its"/>
+ <arg value="-e"/>
<arg value="-B"/>
<arg value="clean"/>
<arg value="install"/>