Fixing this integration test by only introducing the system-scoped dependency on Sun JDKs using java.vendor as the distinguishing point, in order to exclude OS X.

Working toward: MNG-869



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290746 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-09-21 17:14:30 +00:00
parent 0f021ff7eb
commit 1cb0b566b9
2 changed files with 11 additions and 23 deletions

View File

@ -2,7 +2,7 @@ it0067
it0066
it0065
it0064
#it0063
it0063
it0062
it0061
it0060

View File

@ -5,13 +5,6 @@
<packaging>jar</packaging>
<version>1.0</version>
<dependencies>
<dependency>
<groupId>jdk-tools</groupId>
<artifactId>jdk-tools</artifactId>
<version>1.4.2</version>
<scope>system</scope>
<systemPath>${toolsJarPath}</systemPath>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@ -21,6 +14,7 @@
</dependencies>
<profiles>
<profile>
<!-- NOTE: This will not be activated on OS X, since classes.jar already has the tools in it. -->
<id>default-tools.jar</id>
<activation>
<property>
@ -28,21 +22,15 @@
<value>Sun Microsystems Inc.</value>
</property>
</activation>
<properties>
<toolsJarPath>${java.home}/../lib/tools.jar</toolsJarPath>
</properties>
</profile>
<profile>
<id>osx-tools.jar</id>
<activation>
<property>
<name>java.vendor</name>
<value>Apple Computer, Inc.</value>
</property>
</activation>
<properties>
<toolsJarPath>${java.home}/../Classes/classes.jar</toolsJarPath>
</properties>
<dependencies>
<dependency>
<groupId>sun.jdk</groupId>
<artifactId>tools</artifactId>
<version>1.4.2</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
</dependencies>
</profile>
</profiles>
</model>