Fix up API diffs upload script.

build.xml

@@ -126,15 +126,17 @@
   <property name="old.api" value="3.0"/>
   <property name="new.api" value="4.0"/>
   <target name="jdiff">
-        <property name="jdiff.home" value="lib/build/jdiff"/>
-        <property name="jdiff.tmp" value="build/docs/latest-api-diffs"/>
-        <delete dir="${jdiff.tmp}"/>
-        <mkdir dir="${jdiff.tmp}"/>
-
-        <!-- Generate API for current version. -->
+    <property name="jdiff.home" value="lib/build/jdiff"/>
+    <property name="jdiff.tmp" value="build/docs/latest-api-diffs"/>
+    <delete dir="${jdiff.tmp}"/>
+    <mkdir dir="${jdiff.tmp}"/>
+
+    <!-- Generate API for current version. -->
+    <!-- TODO(cgruber) remove postProcessGeneratedJavadocs=false when ant 1.9.4 ships -->
     <javadoc packagenames="com.google.*"
-                 docletpath="${jdiff.home}/jdiff.jar${path.separator}${jdiff.home}/xerces.jar"
-             maxmemory="512M"
+             postProcessGeneratedJavadocs="false"
+             docletpath="${jdiff.home}/jdiff.jar${path.separator}${jdiff.home}/xerces.jar"
+             maxmemory="1024M"
              classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar${path.separator}lib/guava-16.0.1.jar">
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="com/google/**"/>
@@ -149,10 +151,9 @@
       <fileset dir="${multibindings.src.dir}"/>
       <fileset dir="${persist.src.dir}"/>
       <fileset dir="${struts2.src.dir}"/>
-        <fileset dir="${grapher.src.dir}"/>
+      <fileset dir="${grapher.src.dir}"/>
 
-      <doclet name="jdiff.JDiff"
-              path="${jdiff.home}/jdiff.jar:${jdiff.home}/xerces.jar">
+      <doclet name="jdiff.JDiff" path="${jdiff.home}/jdiff.jar:${jdiff.home}/xerces.jar">
         <param name="-apidir" value="${jdiff.tmp}" />
         <param name="-apiname" value="${new.api}" />
       </doclet>

uploadApiDiffs.sh

@@ -16,4 +16,4 @@ cp -r build/docs/javadoc latest-api-diffs/$CV/javadoc
 
 # commit changes
 git add -A latest-api-diffs
-git commit -m "Added updated $CV api diffs."  latest-api-diffs
+echo git commit -m "Added updated $CV api diffs."  latest-api-diffs