myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1406201 - in /myfaces/tobago/trunk: tobago-core/ tobago-extension/tobago-facelets/ tobago-extension/tobago-sandbox/ tobago-extension/tobago-taglib-extension/ tobago-tool/tobago-tool-annotation/ tobago-tool/tobago-tool-apt/
Date Tue, 06 Nov 2012 16:11:51 GMT
Author: lofwyr
Date: Tue Nov  6 16:11:51 2012
New Revision: 1406201

URL: http://svn.apache.org/viewvc?rev=1406201&view=rev
Log:
TOBAGO-1210: Build fails on a mac with jdk 1.7 
 - patch applied

Modified:
    myfaces/tobago/trunk/tobago-core/pom.xml
    myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml
    myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/pom.xml
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml

Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1406201&r1=1406200&r2=1406201&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Tue Nov  6 16:11:51 2012
@@ -367,12 +367,12 @@
   </dependencies>
 
   <profiles>
-    <!-- Mac OS X has not a tools.jar! -->
+    <!-- Apples JDK (until 1.6) 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>
+        <jdk>1.7</jdk>
       </activation>
       <dependencies>
         <dependency>

Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml?rev=1406201&r1=1406200&r2=1406201&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/pom.xml Tue Nov  6 16:11:51 2012
@@ -133,10 +133,12 @@
   </dependencies>
 
   <profiles>
+    <!-- Apples JDK (until 1.6) has not a tools.jar -->
     <profile>
       <id>tools.jar</id>
       <activation>
         <os><family>!mac</family></os>
+        <jdk>1.7</jdk>
       </activation>
       <dependencies>
         <dependency>

Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml?rev=1406201&r1=1406200&r2=1406201&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml Tue Nov  6 16:11:51 2012
@@ -345,12 +345,12 @@
   </dependencies>
 
   <profiles>
-    <!-- Mac OS X has not a tools.jar! -->
+    <!-- Apples JDK (until 1.6) 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>
+        <jdk>1.7</jdk>
       </activation>
       <dependencies>
         <dependency>

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/pom.xml?rev=1406201&r1=1406200&r2=1406201&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/pom.xml Tue Nov  6 16:11:51
2012
@@ -169,12 +169,12 @@
   </dependencies>
 
   <profiles>
-    <!-- Mac OS X has not a tools.jar! -->
+    <!-- Apples JDK (until 1.6) 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>
+        <jdk>1.7</jdk>
       </activation>
       <dependencies>
         <dependency>

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml?rev=1406201&r1=1406200&r2=1406201&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml Tue Nov  6 16:11:51 2012
@@ -34,12 +34,12 @@
   </dependencies>
 
   <profiles>
-    <!-- Mac OS X has not a tools.jar! -->
+    <!-- Apples JDK (until 1.6) 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>
+        <jdk>1.7</jdk>
       </activation>
       <dependencies>
         <dependency>

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml?rev=1406201&r1=1406200&r2=1406201&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml Tue Nov  6 16:11:51 2012
@@ -105,12 +105,12 @@
   </dependencies>
 
   <profiles>
-    <!-- Mac OS X has not a tools.jar! -->
+    <!-- Apples JDK (until 1.6) 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>
+        <jdk>1.7</jdk>
       </activation>
       <dependencies>
         <dependency>



Mime
View raw message