maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r725365 - in /maven/components/branches/maven-2.1.x: ./ build.xml maven-integration-tests/pom.xml maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
Date Wed, 10 Dec 2008 18:27:36 GMT
Author: jdcasey
Date: Wed Dec 10 10:27:35 2008
New Revision: 725365

URL: http://svn.apache.org/viewvc?rev=725365&view=rev
Log:
merge -c 725359 -c 725349 -c 725342 -c 725330 -c 725329 from 2.0.10-RC branch to fix IT builds
on CI systems.

Modified:
    maven/components/branches/maven-2.1.x/   (props changed)
    maven/components/branches/maven-2.1.x/build.xml
    maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml
    maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
  (props changed)

Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 10 10:27:35 2008
@@ -1,4 +1,4 @@
-/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882
+/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,725329-725330,725342,725349,725359
 /maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241,720042
 /maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
 /maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990

Modified: maven/components/branches/maven-2.1.x/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/build.xml?rev=725365&r1=725364&r2=725365&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/build.xml (original)
+++ maven/components/branches/maven-2.1.x/build.xml Wed Dec 10 10:27:35 2008
@@ -36,7 +36,7 @@
 <project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
   
   <target name="initTaskDefs" unless="taskdefs.inited">
-  	<xmlproperty file="pom.xml" prefix="pom.xml" />
+    <xmlproperty file="pom.xml" prefix="pom.xml" />
     <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.0.8.jar"/>
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
classpathref="maven-ant-tasks.classpath"/>
     <property name="taskdefs.inited" value="true"/>
@@ -53,6 +53,7 @@
       <isset property="env.M2_HOME"/>
     </condition>
     <fail unless="maven.home" message="You must set the M2_HOME environment variable or
specify a maven.home property to this Ant script"/>
+    <echo>Using Maven home at: ${maven.home}</echo>
   </target>
   
   <target name="read-poms" depends="initTaskDefs,initLocalRepo" unless="pom.version">
@@ -222,12 +223,14 @@
   
   <target name="its-win32" if="its.win32">
     <echo>Retrieving integration tests</echo>
-    <exec dir="${basedir}/${itPom.artifactId}" executable="cmd">
+    <exec failonerror="true" dir="${basedir}/${itPom.artifactId}" executable="cmd">
+      <env key="M2_HOME" value="${maven.home}"/>
       <arg value="/c"/>
       <arg value="${maven.home}\bin\mvn.bat"/>
       <arg value="process-resources"/>
     </exec>
-    <exec dir="${basedir}/${itPom.artifactId}/target/classes" executable="cmd">
+    <exec failonerror="true" dir="${basedir}/${itPom.artifactId}/target/classes" executable="cmd">
+      <env key="M2_HOME" value="${maven.home}"/>
       <arg value="/c"/>
       <arg value="${maven.home}\bin\mvn.bat"/>
       <arg value="package"/>
@@ -236,6 +239,7 @@
     <echo>Running integration tests</echo>
     <!-- Hard-coding to /tmp/ to avoid long path names that will make windows scream.
-->
     <exec failonerror="true" dir="${java.io.tmpdir}/${itPom.artifactId}-${itPom.version}"
executable="cmd">
+      <env key="M2_HOME" value="${maven.home}"/>
       <arg value="/c"/>
       <arg value="${maven.home}\bin\mvn.bat"/>
       <arg value="-Prun-its"/>
@@ -246,16 +250,19 @@
 
   <target name="its-unix" if="its.unix">
     <echo>Retrieving integration tests</echo>
-    <exec dir="${basedir}/${itPom.artifactId}" executable="${maven.home}/bin/mvn">
+    <exec failonerror="true" dir="${basedir}/${itPom.artifactId}" executable="${maven.home}/bin/mvn">
+      <env key="M2_HOME" value="${maven.home}"/>
       <arg value="process-resources"/>
     </exec>
-    <exec dir="${basedir}/${itPom.artifactId}/target/classes" executable="${maven.home}/bin/mvn">
+    <exec failonerror="true" dir="${basedir}/${itPom.artifactId}/target/classes" executable="${maven.home}/bin/mvn">
+      <env key="M2_HOME" value="${maven.home}"/>
       <arg value="package"/>
     </exec>
     
     <echo>Running integration tests</echo>
-    <!-- Hard-coding to /tmp/ to avoid long path names that will make windows scream.
-->
+    <!-- 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="clean"/>
       <arg value="install"/>

Modified: maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml?rev=725365&r1=725364&r2=725365&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-integration-tests/pom.xml Wed Dec 10 10:27:35
2008
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>2.1.0-M2-SNAPSHOT</version>
+    <version>2.1.x</version>
   </parent>
   <artifactId>maven-integration-tests</artifactId>
   <name>Maven Integration-Test Importer</name>
@@ -76,6 +76,7 @@
         <configuration>
           <connectionUrl>scm:svn:http://svn.apache.org/repos/asf/maven/core-integration-testing/${integrationTestSVNDir}</connectionUrl>
           <checkoutDirectory>${itDir}</checkoutDirectory>
+          <workingDirectory>${itDir}</workingDirectory>
         </configuration>
       </plugin>
     </plugins>

Propchange: maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 10 10:27:35 2008
@@ -1,3 +1,3 @@
-/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688259
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688259,725329-725330,725342,725349,725359
 /maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:690315,691793
 /maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688883,689695,689976,689990



Mime
View raw message