Author: jm
Date: 2013-01-24 13:28:39 -0800 (Thu, 24 Jan 2013)
New Revision: 31085

Modified:
   core3/support/trunk/taglets/pom.xml
Log:
Fixes #1537: taglets project now compiles on Java 7

Modified: core3/support/trunk/taglets/pom.xml
===================================================================
--- core3/support/trunk/taglets/pom.xml 2013-01-24 20:34:58 UTC (rev 31084)
+++ core3/support/trunk/taglets/pom.xml 2013-01-24 21:28:39 UTC (rev 31085)
@@ -30,6 +30,13 @@
                        <version>1.8.1</version>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>com.sun</groupId>
+                       <artifactId>tools</artifactId>
+                       <version>1.4.2</version>
+                       <scope>system</scope>
+                       <systemPath>${toolsjar}</systemPath>
+               </dependency>
        </dependencies>
 
        <distributionManagement>
@@ -151,22 +158,28 @@
 
        <profiles>
                <profile>
-                       <id>default-tools.jar</id>
+                       <id>jre-profile</id>
                        <activation>
-                               <property>
-                                       <name>java.vendor</name>
-                                       <value>Sun Microsystems Inc.</value>
-                               </property>
+                               <activeByDefault>true</activeByDefault>
+                               <file>
+                                       
<exists>${java.home}/../lib/tools.jar</exists>
+                               </file>
                        </activation>
-                       <dependencies>
-                               <dependency>
-                                       <groupId>com.sun</groupId>
-                                       <artifactId>tools</artifactId>
-                                       <version>1.4.2</version>
-                                       <scope>system</scope>
-                                       
<systemPath>${java.home}/../lib/tools.jar</systemPath>
-                               </dependency>
-                       </dependencies>
+                       <properties>
+                               
<toolsjar>${java.home}/../lib/tools.jar</toolsjar>
+                       </properties>
                </profile>
+               <profile>
+                       <id>mac-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>

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
Visit this group at http://groups.google.com/group/cytoscape-cvs?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to