avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r1053746 - in /avro/trunk: CHANGES.txt doc/build.xml doc/forrest.properties
Date Wed, 29 Dec 2010 21:27:15 GMT
Author: cutting
Date: Wed Dec 29 21:27:15 2010
New Revision: 1053746

URL: http://svn.apache.org/viewvc?rev=1053746&view=rev
Log:
AVRO-714. Fix Forrest to work with Java 6.  Contributed by Carl Steinbach.

Added:
    avro/trunk/doc/forrest.properties
Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/doc/build.xml

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1053746&r1=1053745&r2=1053746&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Wed Dec 29 21:27:15 2010
@@ -77,6 +77,8 @@ Avro 1.5.0 (unreleased)
 
     AVRO-707. Java: Promote SASL-based RPC. (cutting)
 
+    AVRO-714. Fix Forrest to work with Java 6. (Carl Steinbach via cutting)
+
   BUG FIXES
 
     AVRO-675. C: Bytes and fixed setters don't update datum size.

Modified: avro/trunk/doc/build.xml
URL: http://svn.apache.org/viewvc/avro/trunk/doc/build.xml?rev=1053746&r1=1053745&r2=1053746&view=diff
==============================================================================
--- avro/trunk/doc/build.xml (original)
+++ avro/trunk/doc/build.xml Wed Dec 29 21:27:15 2010
@@ -17,20 +17,15 @@
       <!ENTITY AvroVersion "${version}">
     </echo>
     <exec executable="${forrest.home}/bin/forrest" failonerror="true">
-      <env key="JAVA_HOME" value="${java5.home}"/>
       <arg value="-Dproject.content-dir=src"/>
       <arg value="-Dproject.site=../${build.dir}/"/>
     </exec>
   </target>
 
-  <target name="forrest.check" unless="forrest.home" depends="java5.check">
+  <target name="forrest.check" unless="forrest.home">
     <fail message="'forrest.home' is not defined. Please pass -Dforrest.home=&lt;base
of Apache Forrest installation&gt; to Ant on the command-line." />
   </target>
 
-  <target name="java5.check" unless="java5.home">
-    <fail message="'java5.home' is not defined.  Forrest requires Java 5.  Please pass
-Djava5.home=&lt;base of Java 5 distribution&gt; to Ant on the command-line." />
-  </target>
-
   <target name="clean" description="Delete build files, and their directories">
     <delete dir="${basedir}/build"/>
   </target>

Added: avro/trunk/doc/forrest.properties
URL: http://svn.apache.org/viewvc/avro/trunk/doc/forrest.properties?rev=1053746&view=auto
==============================================================================
--- avro/trunk/doc/forrest.properties (added)
+++ avro/trunk/doc/forrest.properties Wed Dec 29 21:27:15 2010
@@ -0,0 +1,3 @@
+# Make Forrest work with Java6
+forrest.validate.sitemap=false
+



Mime
View raw message