No longer generate deprecated dists/maven/latest/build.xml

The distpack-maven-* targets no longer create said dir/build.
Use the publish tasks directly instead.

3 files changed, 224 insertions, 316 deletions

diff --git a/build-ant-macros.xml b/build-ant-macros.xml
index 3fc457b2bd..b90102538b 100644
--- a/build-ant-macros.xml
+++ b/build-ant-macros.xml
@@ -489,8 +489,223 @@
     </sequential>
   </macrodef>
 
-  <!-- TODO inline maven-deploy.xml's macrodefs, remove maven-deploy.xml -->
-  <include file="src/build/maven/maven-deploy.xml" as="deploy-macros"/>
+  <macrodef name="deploy-remote">
+    <attribute name="jar" default=""/>
+    <attribute name="pom"/>
+    <element name="artifacts" implicit="true" optional="true"/>
+    <sequential>
+      <if><equals arg1="@{jar}" arg2="true"/><then>
+        <artifact:deploy settingsFile="${settings.file}">
+          <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
+          <artifact:pom refid="@{pom}" />
+          <artifacts/>
+        </artifact:deploy>
+      </then><else>
+        <artifact:deploy file="@{jar}" settingsFile="${settings.file}">
+          <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
+          <artifact:pom refid="@{pom}" />
+          <artifacts/>
+        </artifact:deploy>
+      </else></if>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="deploy-local">
+    <attribute name="jar" default=""/>
+    <attribute name="pom"/>
+    <element name="artifacts" implicit="true" optional="true"/>
+    <sequential>
+      <if><equals arg1="@{jar}" arg2="true"/><then>
+        <artifact:install>
+          <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
+          <artifact:pom refid="@{pom}" />
+          <artifacts/>
+        </artifact:install>
+      </then><else>
+        <artifact:install file="@{jar}">
+          <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
+          <artifact:pom refid="@{pom}" />
+          <artifacts/>
+        </artifact:install>
+      </else></if>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="deploy-to">
+    <attribute name="jar" default=""/>
+    <attribute name="pom"/>
+    <attribute name="local"/>
+    <element name="artifacts" implicit="true" optional="true"/>
+    <sequential>
+      <if><equals arg1="@{local}" arg2="true"/><then>
+        <deploy-local jar="@{jar}" pom="@{pom}"> <artifacts/> </deploy-local>
+      </then><else>
+        <deploy-remote jar="@{jar}" pom="@{pom}"> <artifacts/> </deploy-remote>
+      </else></if>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="filter-pom">
+    <attribute name="path" />
+    <attribute name="name" />
+
+    <sequential>
+      <copy file="${path}-pom.xml" tofile="${path}-pom-filtered.xml" overwrite="true">
+        <filterset>
+          <filter token="VERSION"                    value="${maven.version.number}" />
+          <filter token="SCALA_BINARY_VERSION"       value="${scala.binary.version}" />
+          <filter token="XML_VERSION"                value="${scala-xml.version.number}" />
+          <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
+          <filter token="CONTINUATIONS_PLUGIN_VERSION"  value="${scala-continuations-plugin.version.number}" />
+          <filter token="CONTINUATIONS_LIBRARY_VERSION" value="${scala-continuations-library.version.number}" />
+          <filter token="SCALA_SWING_VERSION"           value="${scala-swing.version.number}" />
+          <filter token="RELEASE_REPOSITORY"         value="${remote.release.repository}" />
+          <filter token="SNAPSHOT_REPOSITORY"        value="${remote.snapshot.repository}" />
+          <filter token="JLINE_VERSION"              value="${jline.version}" />
+          <filter token="AKKA_ACTOR_VERSION"         value="${akka-actor.version.number}" />
+          <filter token="ACTORS_MIGRATION_VERSION"   value="${actors-migration.version.number}" />
+
+          <!-- TODO modularize compiler.
+          <filter token="SCALA_COMPILER_DOC_VERSION" value="${scala-compiler-doc.version.number}" />
+          <filter token="SCALA_COMPILER_INTERACTIVE_VERSION" value="${scala-compiler-interactive.version.number}" />
+          -->
+        </filterset>
+      </copy>
+      <artifact:pom id="@{name}.pom" file="${path}-pom-filtered.xml" />
+    </sequential>
+  </macrodef>
+
+  <macrodef name="deploy-one">
+    <attribute name="name" />
+    <attribute name="local"  default="false"/>
+    <attribute name="signed" default="false"/>
+
+    <sequential>
+      <local name="path"/> <property name="path" value="${dist.maven}/@{name}/@{name}"/>
+
+      <echo>Deploying ${path}-[pom.xml|src.jar|docs.jar].</echo>
+
+      <filter-pom name="@{name}" path="@{path}"/>
+
+      <if><equals arg1="@{signed}" arg2="false"/><then>
+        <if><isset property="docs.skip"/><then>
+          <deploy-to local="@{local}" jar="${path}.jar" pom="@{name}.pom">
+            <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+          </deploy-to>
+        </then><else>
+          <deploy-to local="@{local}" jar="${path}.jar" pom="@{name}.pom">
+            <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+            <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
+          </deploy-to>
+        </else></if>
+      </then><else>
+        <local name="repo"/>
+        <if><equals arg1="@{local}" arg2="false"/><then>
+          <property name="repo" value="${remote.repository}"/>
+        </then><else>
+          <property name="repo" value="${local.repository}"/>
+        </else></if>
+        <artifact:mvn failonerror="true">
+          <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+          <arg value="-Durl=${repo}" />
+          <arg value="-DrepositoryId=${repository.credentials.id}" />
+          <arg value="-DpomFile=${path}-pom-filtered.xml" />
+          <arg value=   "-Dfile=${path}.jar" />
+          <arg value="-Dsources=${path}-src.jar" />
+          <arg value="-Djavadoc=${path}-docs.jar" />
+          <arg value="-Pgpg" />
+          <arg value="-Dgpg.useagent=true" />
+        </artifact:mvn>
+      </else></if>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="deploy-jar">
+    <attribute name="name" />
+    <attribute name="local"  default="false"/>
+    <attribute name="signed" default="false"/>
+
+    <sequential>
+      <local name="path"/> <property name="path" value="${dist.maven}/@{name}/@{name}"/>
+
+      <echo>Deploying ${path}.jar with ${path}-pom.xml.</echo>
+
+      <filter-pom name="@{name}" path="@{path}"/>
+
+      <if><equals arg1="@{signed}" arg2="false"/><then>
+        <deploy-to local="@{local}" jar="${path}.jar" pom="@{name}.pom"/>
+      </then><else>
+        <local name="repo"/>
+        <if><equals arg1="@{local}" arg2="false"/><then>
+          <property name="repo" value="${remote.repository}"/>
+        </then><else>
+          <property name="repo" value="${local.repository}"/>
+        </else></if>
+        <artifact:mvn failonerror="true">
+          <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+          <arg value="-Durl=${repo}" />
+          <arg value="-DrepositoryId=${repository.credentials.id}" />
+          <arg value="-DpomFile=${path}-pom-filtered.xml" />
+          <arg value=   "-Dfile=${path}.jar" />
+          <arg value="-Pgpg" />
+          <arg value="-Dgpg.useagent=true" />
+        </artifact:mvn>
+      </else></if>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="deploy-pom">
+    <attribute name="name" />
+    <attribute name="local"  default="false"/>
+    <attribute name="signed" default="false"/>
+
+    <sequential>
+      <local name="path"/> <property name="path" value="${dist.maven}/@{name}/@{name}"/>
+
+      <echo>Deploying ${path}-pom.xml.</echo>
+
+      <filter-pom name="@{name}" path="@{path}"/>
+
+      <if><equals arg1="@{signed}" arg2="false"/><then>
+        <deploy-to local="@{local}" pom="@{name}.pom"/>
+      </then><else>
+        <local name="repo"/>
+        <if><equals arg1="@{local}" arg2="false"/><then>
+          <property name="repo" value="${remote.repository}"/>
+        </then><else>
+          <property name="repo" value="${local.repository}"/>
+        </else></if>
+        <artifact:mvn failonerror="true">
+          <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+          <arg value="-Durl=${repo}" />
+          <arg value="-DrepositoryId=${repository.credentials.id}" />
+          <arg value="-DpomFile=${path}-pom-filtered.xml" />
+          <arg value=   "-Dfile=${path}-pom-filtered.xml" />
+          <arg value="-Pgpg" />
+          <arg value="-Dgpg.useagent=true" />
+        </artifact:mvn>
+      </else></if>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="deploy">
+    <attribute name="local"  default="false"/>
+    <attribute name="signed" default="false"/>
+
+    <sequential>
+      <deploy-one name="scala-library"     local="@{local}" signed="@{signed}"/>
+      <deploy-one name="scala-reflect"     local="@{local}" signed="@{signed}"/>
+      <deploy-one name="scala-compiler"    local="@{local}" signed="@{signed}"/>
+
+      <!-- TODO modularize compiler.
+      <deploy-one name="scala-compiler-doc"         local="@{local}" signed="@{signed}"/>
+      <deploy-one name="scala-compiler-interactive" local="@{local}" signed="@{signed}"/>
+      -->
+
+      <deploy-one name="scala-actors"      local="@{local}" signed="@{signed}"/>
+      <deploy-one name="scalap"            local="@{local}" signed="@{signed}"/>
+    </sequential>
+  </macrodef>
 
   <macrodef name="testSuite">
     <attribute name="dir" default="${partest.dir}"/>
diff --git a/build.xml b/build.xml
index 37de9a732f..98c27af388 100755
--- a/build.xml
+++ b/build.xml
@@ -31,7 +31,6 @@ supported/exercised targets
 
 DO NOT RELY ON ANY OTHER TARGETS (ok, you're probably ok assuming the ones defined in the first 100 lines of this file)
 
-NOTE: dists/maven/latest/build.xml will soon disappear; call `publish` in this build instead
 -->
 
 <!-- To use Zinc with the ant build:
@@ -1794,7 +1793,7 @@ MAIN DISTRIBUTION PACKAGING
     </jar>
   </target>
 
-  <target name="pack-maven.base" depends="pack-maven.core, osgi.done, docs.done, pack-maven.dist">
+  <target name="pack-maven.done" depends="pack-maven.core, osgi.done, docs.done, pack-maven.dist">
     <!-- TODO modularize compiler
     <mvn-package project="interactive"/>
     <mvn-package project="scaladoc"/>
@@ -1812,30 +1811,9 @@ MAIN DISTRIBUTION PACKAGING
     </then></if>
   </target>
 
-  <!-- TODO: remove this target and delete src/build/maven-deploy.xml -->
-  <target name="pack-maven.done" depends="pack-maven.base">
-    <!-- Create dists/maven/latest alias and copy maven-deploy ant build there. -->
-    <if><isset property="os.win"/><then>
-      <copy todir="${dists.dir}/maven/latest" overwrite="true">
-        <fileset dir="${dist.maven}"/>
-      </copy>
-    </then><else>
-      <symlink link="${dists.dir}/maven/latest"
-               resource="${version.number}"
-               overwrite="true"/>
-    </else></if>
-    <!-- copy build file and its dependencies -->
-    <copy todir="${dist.maven}"
-          file="${lib-ant.dir}/ant-contrib.jar" overwrite="true"/>
-    <copy todir="${dist.maven}"
-          file="${lib-ant.dir}/maven-ant-tasks-2.1.1.jar" overwrite="true"/>
-    <copy tofile="${dist.maven}/build.xml"
-          file="${src.dir}/build/maven/maven-deploy.xml"/>
-    <!-- export properties for use when deploying -->
-    <echoproperties destfile="${dist.maven}/build.properties"/>
-  </target>
-
-  <!-- keep these properties out of ${dist.maven}/build.properties, dumped in pack-maven.done -->
+<!-- ===========================================================================
+                                  MAVEN PUBLISHING
+============================================================================ -->
   <target name="init.maven" depends="init">
     <property name="remote.snapshot.repository" value="https://oss.sonatype.org/content/repositories/snapshots" />
     <property name="remote.release.repository"  value="https://oss.sonatype.org/service/local/staging/deploy/maven2" />
@@ -1855,23 +1833,19 @@ MAIN DISTRIBUTION PACKAGING
     </else></if>
   </target>
 
-
-<!-- ===========================================================================
-                                  MAVEN PUBLISHING
-============================================================================ -->
-  <target name="publish"        depends="pack-maven.base, init.maven" description="Publishes unsigned artifacts to the maven repo.">
+  <target name="publish"        depends="pack-maven.done, init.maven" description="Publishes unsigned artifacts to the maven repo.">
     <deploy />
     <deploy-pom name="scala-library-all"/>
     <deploy-jar name="scala-dist"/>
   </target>
 
-  <target name="publish.local"  depends="pack-maven.base, init.maven" description="Publishes unsigned artifacts to the local maven repo.">
+  <target name="publish.local"  depends="pack-maven.done, init.maven" description="Publishes unsigned artifacts to the local maven repo.">
     <deploy local="true"/>
     <deploy-pom name="scala-library-all" local="true"/>
     <deploy-jar name="scala-dist" local="true"/>
   </target>
 
-  <target name="publish.signed" depends="pack-maven.base, init.maven" description="Publishes signed artifacts to the remote maven repo.">
+  <target name="publish.signed" depends="pack-maven.done, init.maven" description="Publishes signed artifacts to the remote maven repo.">
     <deploy signed="true"/>
     <deploy-pom name="scala-library-all" signed="true"/>
     <deploy-jar name="scala-dist" signed="true"/>
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
deleted file mode 100644
index a2c3eefbca..0000000000
--- a/src/build/maven/maven-deploy.xml
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-THIS FILE WILL SOON SELF DESTRUCT; DO NOT USE
-see publish.* targets in /build.xml
--->
-<project name="sabbus-maven-deploy" xmlns:artifact="urn:maven-artifact-ant">
-
-  <description>
-    SuperSabbus extension for deploying a distribution to Maven. THIS FILE IS MEANT TO BE RUN STANDALONE IN THE MAVEN "distpack" DIRECTORY
-  </description>
-
-
-  <macrodef name="deploy-remote">
-    <attribute name="jar" default=""/>
-    <attribute name="pom"/>
-    <element name="artifacts" implicit="true" optional="true"/>
-    <sequential>
-      <if><equals arg1="@{jar}" arg2="true"/><then>
-        <artifact:deploy settingsFile="${settings.file}">
-          <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
-          <artifact:pom refid="@{pom}" />
-          <artifacts/>
-        </artifact:deploy>
-      </then><else>
-        <artifact:deploy file="@{jar}" settingsFile="${settings.file}">
-          <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
-          <artifact:pom refid="@{pom}" />
-          <artifacts/>
-        </artifact:deploy>
-      </else></if>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="deploy-local">
-    <attribute name="jar" default=""/>
-    <attribute name="pom"/>
-    <element name="artifacts" implicit="true" optional="true"/>
-    <sequential>
-      <if><equals arg1="@{jar}" arg2="true"/><then>
-        <artifact:install>
-          <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
-          <artifact:pom refid="@{pom}" />
-          <artifacts/>
-        </artifact:install>
-      </then><else>
-        <artifact:install file="@{jar}">
-          <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
-          <artifact:pom refid="@{pom}" />
-          <artifacts/>
-        </artifact:install>
-      </else></if>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="deploy-to">
-    <attribute name="jar" default=""/>
-    <attribute name="pom"/>
-    <attribute name="local"/>
-    <element name="artifacts" implicit="true" optional="true"/>
-    <sequential>
-      <if><equals arg1="@{local}" arg2="true"/><then>
-        <deploy-local jar="@{jar}" pom="@{pom}"> <artifacts/> </deploy-local>
-      </then><else>
-        <deploy-remote jar="@{jar}" pom="@{pom}"> <artifacts/> </deploy-remote>
-      </else></if>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="filter-pom">
-    <attribute name="path" />
-    <attribute name="name" />
-
-    <sequential>
-      <copy file="${path}-pom.xml" tofile="${path}-pom-filtered.xml" overwrite="true">
-        <filterset>
-          <filter token="VERSION"                    value="${maven.version.number}" />
-          <filter token="SCALA_BINARY_VERSION"       value="${scala.binary.version}" />
-          <filter token="XML_VERSION"                value="${scala-xml.version.number}" />
-          <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
-          <filter token="CONTINUATIONS_PLUGIN_VERSION"  value="${scala-continuations-plugin.version.number}" />
-          <filter token="CONTINUATIONS_LIBRARY_VERSION" value="${scala-continuations-library.version.number}" />
-          <filter token="SCALA_SWING_VERSION"           value="${scala-swing.version.number}" />
-          <filter token="RELEASE_REPOSITORY"         value="${remote.release.repository}" />
-          <filter token="SNAPSHOT_REPOSITORY"        value="${remote.snapshot.repository}" />
-          <filter token="JLINE_VERSION"              value="${jline.version}" />
-          <filter token="AKKA_ACTOR_VERSION"         value="${akka-actor.version.number}" />
-          <filter token="ACTORS_MIGRATION_VERSION"   value="${actors-migration.version.number}" />
-
-          <!-- TODO modularize compiler.
-          <filter token="SCALA_COMPILER_DOC_VERSION" value="${scala-compiler-doc.version.number}" />
-          <filter token="SCALA_COMPILER_INTERACTIVE_VERSION" value="${scala-compiler-interactive.version.number}" />
-          -->
-        </filterset>
-      </copy>
-      <artifact:pom id="@{name}.pom" file="${path}-pom-filtered.xml" />
-    </sequential>
-  </macrodef>
-
-  <macrodef name="deploy-one">
-    <attribute name="name" />
-    <attribute name="local"  default="false"/>
-    <attribute name="signed" default="false"/>
-
-    <sequential>
-      <local name="path"/> <property name="path" value="${dist.maven}/@{name}/@{name}"/>
-
-      <echo>Deploying ${path}-[pom.xml|src.jar|docs.jar].</echo>
-
-      <filter-pom name="@{name}" path="@{path}"/>
-
-      <if><equals arg1="@{signed}" arg2="false"/><then>
-        <if><isset property="docs.skip"/><then>
-          <deploy-to local="@{local}" jar="${path}.jar" pom="@{name}.pom">
-            <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
-          </deploy-to>
-        </then><else>
-          <deploy-to local="@{local}" jar="${path}.jar" pom="@{name}.pom">
-            <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
-            <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
-          </deploy-to>
-        </else></if>
-      </then><else>
-        <local name="repo"/>
-        <if><equals arg1="@{local}" arg2="false"/><then>
-          <property name="repo" value="${remote.repository}"/>
-        </then><else>
-          <property name="repo" value="${local.repository}"/>
-        </else></if>
-        <artifact:mvn failonerror="true">
-          <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
-          <arg value="-Durl=${repo}" />
-          <arg value="-DrepositoryId=${repository.credentials.id}" />
-          <arg value="-DpomFile=${path}-pom-filtered.xml" />
-          <arg value=   "-Dfile=${path}.jar" />
-          <arg value="-Dsources=${path}-src.jar" />
-          <arg value="-Djavadoc=${path}-docs.jar" />
-          <arg value="-Pgpg" />
-          <arg value="-Dgpg.useagent=true" />
-        </artifact:mvn>
-      </else></if>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="deploy-jar">
-    <attribute name="name" />
-    <attribute name="local"  default="false"/>
-    <attribute name="signed" default="false"/>
-
-    <sequential>
-      <local name="path"/> <property name="path" value="${dist.maven}/@{name}/@{name}"/>
-
-      <echo>Deploying ${path}.jar with ${path}-pom.xml.</echo>
-
-      <filter-pom name="@{name}" path="@{path}"/>
-
-      <if><equals arg1="@{signed}" arg2="false"/><then>
-        <deploy-to local="@{local}" jar="${path}.jar" pom="@{name}.pom"/>
-      </then><else>
-        <local name="repo"/>
-        <if><equals arg1="@{local}" arg2="false"/><then>
-          <property name="repo" value="${remote.repository}"/>
-        </then><else>
-          <property name="repo" value="${local.repository}"/>
-        </else></if>
-        <artifact:mvn failonerror="true">
-          <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
-          <arg value="-Durl=${repo}" />
-          <arg value="-DrepositoryId=${repository.credentials.id}" />
-          <arg value="-DpomFile=${path}-pom-filtered.xml" />
-          <arg value=   "-Dfile=${path}.jar" />
-          <arg value="-Pgpg" />
-          <arg value="-Dgpg.useagent=true" />
-        </artifact:mvn>
-      </else></if>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="deploy-pom">
-    <attribute name="name" />
-    <attribute name="local"  default="false"/>
-    <attribute name="signed" default="false"/>
-
-    <sequential>
-      <local name="path"/> <property name="path" value="${dist.maven}/@{name}/@{name}"/>
-
-      <echo>Deploying ${path}-pom.xml.</echo>
-
-      <filter-pom name="@{name}" path="@{path}"/>
-
-      <if><equals arg1="@{signed}" arg2="false"/><then>
-        <deploy-to local="@{local}" pom="@{name}.pom"/>
-      </then><else>
-        <local name="repo"/>
-        <if><equals arg1="@{local}" arg2="false"/><then>
-          <property name="repo" value="${remote.repository}"/>
-        </then><else>
-          <property name="repo" value="${local.repository}"/>
-        </else></if>
-        <artifact:mvn failonerror="true">
-          <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
-          <arg value="-Durl=${repo}" />
-          <arg value="-DrepositoryId=${repository.credentials.id}" />
-          <arg value="-DpomFile=${path}-pom-filtered.xml" />
-          <arg value=   "-Dfile=${path}-pom-filtered.xml" />
-          <arg value="-Pgpg" />
-          <arg value="-Dgpg.useagent=true" />
-        </artifact:mvn>
-      </else></if>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="deploy">
-    <attribute name="local"  default="false"/>
-    <attribute name="signed" default="false"/>
-
-    <sequential>
-      <deploy-one name="scala-library"     local="@{local}" signed="@{signed}"/>
-      <deploy-one name="scala-reflect"     local="@{local}" signed="@{signed}"/>
-      <deploy-one name="scala-compiler"    local="@{local}" signed="@{signed}"/>
-
-      <!-- TODO modularize compiler.
-      <deploy-one name="scala-compiler-doc"         local="@{local}" signed="@{signed}"/>
-      <deploy-one name="scala-compiler-interactive" local="@{local}" signed="@{signed}"/>
-      -->
-
-      <deploy-one name="scala-actors"      local="@{local}" signed="@{signed}"/>
-      <deploy-one name="scalap"            local="@{local}" signed="@{signed}"/>
-    </sequential>
-  </macrodef>
-
-
-  <target name="boot.maven">
-    <!-- Pull in properties from build -->
-    <property file="build.properties" />
-    <!-- Set up Ant contrib tasks so we can use <if><then><else> instead of the clunky `unless` attribute -->
-    <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="ant-contrib.jar"/>
-
-    <!-- Add our maven ant tasks -->
-    <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.1.jar" />
-    <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
-  </target>
-
-  <target name="init.maven" depends="boot.maven">
-    <property name="remote.snapshot.repository" value="https://oss.sonatype.org/content/repositories/snapshots" />
-    <property name="remote.release.repository"  value="https://oss.sonatype.org/service/local/staging/deploy/maven2" />
-
-    <property name="local.snapshot.repository" value="${user.home}/.m2/repository" />
-    <property name="local.release.repository"  value="${user.home}/.m2/repository" />
-
-    <property name="repository.credentials.id" value="sonatype-nexus" />
-    <property name="settings.file" value="${user.home}/.m2/settings.xml" />
-
-    <if><contains string="${maven.version.number}" substring="-SNAPSHOT"/><then>
-      <property name="remote.repository" value="${remote.snapshot.repository}"/>
-      <property name="local.repository"  value="${local.snapshot.repository}"/>
-    </then><else>
-      <property name="remote.repository" value="${remote.release.repository}"/>
-      <property name="local.repository"  value="${local.release.repository}"/>
-    </else></if>
-
-    <echo>Using server[${repository.credentials.id}] for maven repository credentials.
-       Please make sure that your ~/.m2/settings.xml has the needed username/password for this server id
-    </echo>
-  </target>
-
-  <target name="deploy"        depends="init.maven" description="Deploys unsigned artifacts to the maven repo.">
-    <echo message="WARNING!1! THIS TARGET HAS BEEN DEPRECATED -- CALL `ant publish` FROM /build.xml"/>
-    <deploy/>
-  </target>
-
-  <target name="deploy.local"  depends="init.maven" description="Deploys unsigned artifacts to the local maven repo.">
-    <echo message="WARNING!1! THIS TARGET HAS BEEN DEPRECATED -- CALL `ant publish.local` FROM /build.xml"/>
-    <deploy local="true"/>
-  </target>
-
-  <target name="deploy.signed" depends="init.maven" description="Deploys signed artifacts to the remote maven repo.">
-    <echo message="WARNING!1! THIS TARGET HAS BEEN DEPRECATED -- CALL `ant publish.signed` FROM /build.xml"/>
-    <deploy signed="true"/>
-  </target>
-</project>