You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2006/04/02 15:17:35 UTC
svn commit: r390818 - in /incubator/tobago/trunk: tobago-core/pom.xml
tobago-tool/tobago-tool-apt/pom.xml
Author: lofwyr
Date: Sun Apr 2 06:17:32 2006
New Revision: 390818
URL: http://svn.apache.org/viewcvs?rev=390818&view=rev
Log:
change dependency activation for the tools.jar, work under Mac OS X with maven 2.0.3
Modified:
incubator/tobago/trunk/tobago-core/pom.xml
incubator/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
Modified: incubator/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/pom.xml?rev=390818&r1=390817&r2=390818&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/pom.xml (original)
+++ incubator/tobago/trunk/tobago-core/pom.xml Sun Apr 2 06:17:32 2006
@@ -216,20 +216,20 @@
</dependency>-->
<dependency>
- <groupId>myfaces</groupId>
- <!--<groupId>org.apache.myfaces.core</groupId>-->
+ <!--<groupId>myfaces</groupId>-->
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.1</version>
- <!--<version>1.1.3-SNAPSHOT</version>-->
+ <!--<version>1.1.1</version>-->
+ <version>1.1.3-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>myfaces</groupId>
- <!--<groupId>org.apache.myfaces.core</groupId>-->
+ <!--<groupId>myfaces</groupId>-->
+ <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.1</version>
- <!--<version>1.1.3-SNAPSHOT</version>-->
+ <!--<version>1.1.1</version>-->
+ <version>1.1.3-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
@@ -247,17 +247,26 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
-
</dependencies>
<profiles>
+ <!-- Mac OS X has not a tools.jar! -->
+ <profile>
+ <id>tools.jar</id>
+ <activation>
+ <!-- needs maven 2.0.3 or higher under Mac OS X -->
+ <os><family>!mac</family></os>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
<profile>
<id>generate-tag-reference</id>
<build>
Modified: incubator/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml?rev=390818&r1=390817&r2=390818&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml (original)
+++ incubator/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml Sun Apr 2 06:17:32 2006
@@ -60,26 +60,11 @@
</dependencies>
<profiles>
- <!-- macx has not a tools.jar! -->
- <profile>
- <id>tools.jar</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- <!-- macx has not a tools.jar!
+ <!-- Mac OS X has not a tools.jar! -->
<profile>
<id>tools.jar</id>
<activation>
+ <!-- needs maven 2.0.3 or higher under Mac OS X -->
<os><family>!mac</family></os>
</activation>
<dependencies>
@@ -92,6 +77,5 @@
</dependency>
</dependencies>
</profile>
- -->
</profiles>
</project>