Author: jdcasey
Date: Wed Sep 21 10:14:30 2005
New Revision: 290746
URL: http://svn.apache.org/viewcvs?rev=290746&view=rev
Log:
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
Modified:
maven/components/trunk/maven-core-it/integration-tests.txt
maven/components/trunk/maven-core-it/it0063/pom.xml
Modified: maven/components/trunk/maven-core-it/integration-tests.txt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/integration-tests.txt?rev=290746&r1=290745&r2=290746&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/integration-tests.txt (original)
+++ maven/components/trunk/maven-core-it/integration-tests.txt Wed Sep 21
10:14:30 2005
@@ -2,7 +2,7 @@
it0066
it0065
it0064
-#it0063
+it0063
it0062
it0061
it0060
Modified: maven/components/trunk/maven-core-it/it0063/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0063/pom.xml?rev=290746&r1=290745&r2=290746&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it0063/pom.xml (original)
+++ maven/components/trunk/maven-core-it/it0063/pom.xml Wed Sep 21 10:14:30 2005
@@ -6,13 +6,6 @@
<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>
<version>3.8.1</version>
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
