yohoho no longer cares if depot is built with 1.6, so build with that since we're using 1.6's Connection.createArrayOf in PostgreSQL4Builder. Sneak a ooo-buildification in with the compiler version bump.

build.xml

@@ -8,48 +8,34 @@
   <property name="tclasses.dir" value="${deploy.dir}/test-classes"/>
   <property name="javadoc.dir"  value="${deploy.dir}/docs"/>
 
-  <property name="maven-ant.vers" value="2.1.1"/>
-  <property name="maven-ant.dir" value="${user.home}/.m2/ant-support"/>
-  <property name="maven-ant.jar" value="${maven-ant.dir}/maven-ant-tasks-${maven-ant.vers}.jar"/>
-  <property name="maven-ant.url"
-            value="http://mirrors.ibiblio.org/pub/mirrors/apache/maven/binaries"/>
-  <condition property="maven-ant.exists"><available file="${maven-ant.jar}"/></condition>
-  <target name="-download-maven-ant" unless="maven-ant.exists">
-    <mkdir dir="${maven-ant.dir}"/>
-    <get src="${maven-ant.url}/maven-ant-tasks-${maven-ant.vers}.jar"
-         dest="${maven-ant.jar}" usetimestamp="true"/>
-  </target>
+  <property name="ooo-build.vers" value="2.1"/>
+  <ant antfile="bootstrap.xml"/>
+  <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
 
-  <target name="-init-maven-ant" depends="-download-maven-ant">
-    <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
-             uri="urn:maven-artifact-ant" classpath="${maven-ant.jar}"/>
-    <artifact:pom id="pom" file="pom.xml"/>
-    <artifact:dependencies pathId="classpath" pomRefId="pom"/>
-    <path id="test.classpath">
-      <path refid="classpath"/>
+  <target name="-prepare" depends="-init-contrib">
+    <mkdir dir="${deploy.dir}"/>
+    <mavendep pom="pom.xml" scope="compile"/>
+    <mavendep pom="pom.xml" id="test" scope="test"/>
+    <path id="built.path">
+      <path refid="test.path"/>
       <pathelement location="${classes.dir}"/>
       <pathelement location="${tclasses.dir}"/>
     </path>
   </target>
 
-  <target name="-prepare" depends="-init-maven-ant">
-    <mkdir dir="${deploy.dir}"/>
-  </target>
-
   <target name="genrecord" depends="-prepare"
           description="Generates fields for persistent record classes.">
     <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask"
-             classpathref="test.classpath"/>
+             classpathref="built.path"/>
     <!-- make sure the record class files are all compiled -->
-    <javac destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" deprecation="on">
-      <src path="${src.dir}"/>
-      <src path="${test.dir}"/>
-      <classpath refid="classpath"/>
+    <ooojavac destdir="${classes.dir}" classpathref="pom.xml.path" srcdir="${src.dir}">
       <include name="**/*Record.java"/>
-    </javac>
+    </ooojavac>
+    <ooojavac destdir="${tclasses.dir}" classpathref="pom.xml.path" srcdir="${test.dir}">
+      <include name="**/*Record.java"/>
+    </ooojavac>
     <!-- now update the source files -->
-    <grecord classpathref="test.classpath">
+    <grecord classpathref="built.path">
       <fileset dir="${src.dir}" includes="**/*Record.java"/>
       <fileset dir="${test.dir}" includes="**/*Record.java"/>
     </grecord>
@@ -71,21 +57,10 @@
     <copy todir="${classes.dir}">
       <fileset dir="src/main/resources" includes="**/*.tmpl"/>
     </copy>
-    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" source="1.5" target="1.5" encoding="utf-8">
-      <classpath refid="classpath"/>
-      <compilerarg value="-Xlint"/>
-      <compilerarg value="-Xlint:-serial"/>
-      <compilerarg value="-Xlint:rawtypes"/>
-    </javac>
+    <ooojavac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="pom.xml.path"/>
 
     <mkdir dir="${tclasses.dir}"/>
-    <javac srcdir="${test.dir}" destdir="${tclasses.dir}" includeAntRuntime="false"
-           debug="on" optimize="${build.optimize}" source="1.5" target="1.5" encoding="utf-8">
-      <classpath refid="test.classpath"/>
-      <compilerarg value="-Xlint"/>
-      <compilerarg value="-Xlint:-serial"/>
-    </javac>
+    <ooojavac srcdir="${test.dir}" destdir="${tclasses.dir}" classpathref="built.path"/>
   </target>
 
   <target name="javadoc" depends="-prepare" description="Generates javadoc documentation.">
@@ -110,11 +85,11 @@
   <target name="tests" depends="compile" description="Runs the unit tests.">
     <!-- allows passing -Dtest=NamePrefix to restrict to subset of tests -->
     <property name="test" value=""/>
-    <taskdef name="unit" classpathref="classpath"
+    <taskdef name="unit" classpathref="test.path"
       classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
     <mkdir dir="${deploy.dir}/test-reports"/>
     <unit printsummary="off" haltonfailure="yes" fork="${junit.fork}">
-      <classpath refid="test.classpath"/>
+      <classpath refid="built.path"/>
       <sysproperty key="com.samskivert.depot.debug" value="${debug}"/>
       <formatter type="brief" usefile="false"/>
       <formatter type="xml"/>
@@ -128,14 +103,8 @@
     <jar destfile="${deploy.dir}/${ant.project.name}.jar" basedir="${classes.dir}"/>
   </target>
 
-  <property name="maven.deploy.repo" value="file://${user.home}/.m2/repository"/>
-  <target name="maven-deploy" depends="dist,tests" 
+  <target name="maven-deploy" depends="dist"
           description="Deploys our build artifacts to a Maven repository.">
-    <jar basedir="${src.dir}" destfile="${deploy.dir}/${ant.project.name}-sources.jar"/>
-    <artifact:deploy file="${deploy.dir}/${ant.project.name}.jar" uniqueVersion="false">
-      <remoteRepository url="${maven.deploy.repo}"/>
-      <pom refid="pom"/>
-      <attach file="${deploy.dir}/${ant.project.name}-sources.jar" classifier="sources"/>
-    </artifact:deploy>
+    <mavendeploy file="${deploy.dir}/${ant.project.name}.jar" pom="pom.xml" srcdir="${src.dir}"/>
   </target>
 </project>