You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/08/13 13:41:21 UTC
svn commit: r1513444 -
/maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/pom.xml
Author: olamy
Date: Tue Aug 13 11:41:20 2013
New Revision: 1513444
URL: http://svn.apache.org/r1513444
Log:
to fix issue on osx with 1.6
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/pom.xml
Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/pom.xml?rev=1513444&r1=1513443&r2=1513444&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/error-prone-compiler/pom.xml Tue Aug 13 11:41:20 2013
@@ -77,7 +77,7 @@
<artifactId>tools</artifactId>
<version>1.6</version>
<scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ <systemPath>${toolsjar}</systemPath>
</dependency>
</dependencies>
@@ -108,4 +108,31 @@
</repository>
</repositories>
+ <profiles>
+ <profile>
+ <id>standardToolsJar-profile</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <file>
+ <exists>${java.home}/../lib/tools.jar</exists>
+ </file>
+ </activation>
+ <properties>
+ <toolsjar>${java.home}/../lib/tools.jar</toolsjar>
+ </properties>
+ </profile>
+ <profile>
+ <id>appleJdkToolsJar-profile</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <file>
+ <exists>${java.home}/../Classes/classes.jar</exists>
+ </file>
+ </activation>
+ <properties>
+ <toolsjar>${java.home}/../Classes/classes.jar</toolsjar>
+ </properties>
+ </profile>
+ </profiles>
+
</project>