Author: hboutemy
Date: Sat May 26 05:57:11 2012
New Revision: 1342857
URL: http://svn.apache.org/viewvc?rev=1342857&view=rev
Log:
[MPLUGIN-202] reverted specific tools.jar location on Mac from r 1342453 since
it wreaks havoc
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml
Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml?rev=1342857&r1=1342856&r2=1342857&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml Sat May 26
05:57:11 2012
@@ -45,28 +45,13 @@
</dependencies>
<profiles>
- <!-- olamy: this profile fail on osx so desactivate it -->
- <!--profile>
- <id>mac</id>
- <activation>
- <os>
- <family>mac</family>
- </os>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.4.2</version>
- <scope>system</scope>
- <systemPath>${java.home}/../Classes/classes.jar</systemPath>
- </dependency>
- </dependencies>
- </profile-->
<profile>
- <id>default</id>
+ <id>default-tools.jar</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>java.vendor</name>
+ <value>Sun Microsystems Inc.</value>
+ </property>
</activation>
<dependencies>
<dependency>
@@ -78,15 +63,12 @@
</dependency>
</dependencies>
</profile>
-
<profile>
<id>run-its</id>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>${mavenInvokerPluginVersion}</version>
<configuration>
<debug>true</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
