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/04/12 12:50:26 UTC
svn commit: r764290 -
/maven/core-integration-testing/trunk/core-it-suite/pom.xml
Author: bentmann
Date: Sun Apr 12 10:50:26 2009
New Revision: 764290
URL: http://svn.apache.org/viewvc?rev=764290&view=rev
Log:
o Fixed coverage report on Unix
o Removed workaround for MNG-3900
Modified:
maven/core-integration-testing/trunk/core-it-suite/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/pom.xml?rev=764290&r1=764289&r2=764290&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/pom.xml Sun Apr 12 10:50:26 2009
@@ -161,10 +161,6 @@
<profile>
<id>emma</id>
<properties>
- <!--
- NOTE: Maven 3.0-alpha-1 doesn't properly handle profiles+interpolation (MNG-3900) so we use the literal value
- instead of this property below. Apparently, we can switch to using the property once the issue is fixed.
- -->
<preparedMavenHome>${project.build.directory}/distro</preparedMavenHome>
</properties>
<build>
@@ -175,17 +171,6 @@
<configuration>
<skip>false</skip>
<testFailureIgnore>true</testFailureIgnore>
- <systemProperties>
- <!-- TODO: Duplicated to workaround MNG-3900, remove entire <systemProperties> section once fixed -->
- <property>
- <name>maven.version</name>
- <value>${maven.version}</value>
- </property>
- <property>
- <name>maven.home</name>
- <value>${project.build.directory}/distro</value>
- </property>
- </systemProperties>
</configuration>
</plugin>
<plugin>
@@ -201,10 +186,11 @@
</goals>
<configuration>
<tasks>
- <delete dir="${project.build.directory}/distro"/>
- <copy todir="${project.build.directory}/distro" overwrite="true">
+ <delete dir="${preparedMavenHome}"/>
+ <copy todir="${preparedMavenHome}" overwrite="true">
<fileset dir="${mavenHome}"/>
</copy>
+ <chmod dir="${preparedMavenHome}/bin" perm="ugo+rx" includes="mvn,mvnDebug"/>
</tasks>
</configuration>
</execution>
@@ -229,7 +215,7 @@
<version>2.1.5320</version>
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/distro/lib</outputDirectory>
+ <outputDirectory>${preparedMavenHome}/lib</outputDirectory>
</configuration>
</execution>
</executions>
@@ -241,7 +227,7 @@
<configuration>
<jarSets>
<jarSet>
- <directory>${project.build.directory}/distro/lib</directory>
+ <directory>${preparedMavenHome}/lib</directory>
<includes>
<include>maven*.jar</include>
</includes>