Merge pull request #3069 from adriaanm/build-maven-publish

Rework build to allow publishing core to maven

11 files changed, 460 insertions, 738 deletions

diff --git a/src/build/bnd/scala-parser-combinators.bnd b/src/build/bnd/scala-parser-combinators.bnd
index d712a4ba2a..6ffc3b2760 100644
--- a/src/build/bnd/scala-parser-combinators.bnd
+++ b/src/build/bnd/scala-parser-combinators.bnd
@@ -1,5 +1,5 @@
 Bundle-Name: Scala Parser Combinators Library
-Bundle-SymbolicName: org.scala-lang.scala-parser-combinators
+Bundle-SymbolicName: org.scala-lang.modules.scala-parser-combinators
 ver: @VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
diff --git a/src/build/bnd/scala-xml.bnd b/src/build/bnd/scala-xml.bnd
index 6203c57dfe..5d64c05e65 100644
--- a/src/build/bnd/scala-xml.bnd
+++ b/src/build/bnd/scala-xml.bnd
@@ -1,5 +1,5 @@
 Bundle-Name: Scala XML Library
-Bundle-SymbolicName: org.scala-lang.scala-xml
+Bundle-SymbolicName: org.scala-lang.modules.scala-xml
 ver: @VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index fbd6d4cd51..9e4215d297 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -6,10 +6,106 @@
     SuperSabbus extension for deploying a distribution to Maven. THIS FILE IS MEANT TO BE RUN STANDALONE IN THE MAVEN "distpack" DIRECTORY
   </description>
 
-  <target name="boot">
+  <macrodef name="deploy-one">
+    <attribute name="dir" default=""/>
+    <attribute name="name" />
+    <attribute name="local"  default="false"/>
+    <attribute name="signed" default="false"/>
+
+    <sequential>
+      <local name="path"/> <property name="path" value="@{dir}@{name}/@{name}"/>
+
+      <echo>Deploying ${path}-[pom.xml|src.jar|docs.jar].</echo>
+
+      <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="RELEASE_REPOSITORY" value="${remote.release.repository}" />
+          <filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" />
+          <filter token="JLINE_VERSION" value="${jline.version}" />
+        </filterset>
+      </copy>
+      <artifact:pom id="@{name}.pom" file="${path}-pom-filtered.xml" />
+
+      <if><equals arg1="@{signed}" arg2="false"/><then>
+        <if><equals arg1="@{local}" arg2="false"/><then>
+          <artifact:deploy file="${path}.jar" settingsFile="${settings.file}">
+            <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
+            <artifact:pom refid="@{name}.pom" />
+            <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+            <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
+          </artifact:deploy>
+        </then><else>
+          <if><isset property="docs.skip"/><then>
+             <artifact:install file="${path}.jar">
+               <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
+               <artifact:pom refid="@{name}.pom" />
+               <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+             </artifact:install>
+          </then>
+          <else>
+            <artifact:install file="${path}.jar">
+              <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
+              <artifact:pom refid="@{name}.pom" />
+              <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+              <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
+            </artifact:install>
+          </else>
+          </if>
+        </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">
+    <attribute name="dir"    default=""/>
+    <attribute name="local"  default="false"/>
+    <attribute name="signed" default="false"/>
+
+    <sequential>
+      <deploy-one dir="@{dir}"          name="scala-library"     local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-reflect"     local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-compiler"    local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-actors"      local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-swing"       local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scalap"            local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}plugins/"  name="continuations"     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" />
 
@@ -19,15 +115,6 @@
     <property name="repository.credentials.id" value="sonatype-nexus" />
     <property name="settings.file" value="${user.home}/.m2/settings.xml" />
 
-    <!-- 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" depends="boot">
     <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}"/>
@@ -39,96 +126,9 @@
     <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>
-
-    <macrodef name="deploy-one">
-      <attribute name="dir" default=""/>
-      <attribute name="name" />
-      <attribute name="version" />
-      <attribute name="local" />
-      <attribute name="signed" />
-
-      <sequential>
-        <local name="path"/> <property name="path" value="@{dir}@{name}/@{name}"/>
-
-        <echo>Deploying ${path}-[pom.xml|src.jar|docs.jar].</echo>
-
-        <copy file="${path}-pom.xml" tofile="${path}-pom-filtered.xml" overwrite="true">
-          <filterset>
-            <filter token="VERSION" value="@{version}" />
-            <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="RELEASE_REPOSITORY" value="${remote.release.repository}" />
-            <filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" />
-            <filter token="JLINE_VERSION" value="${jline.version}" />
-          </filterset>
-        </copy>
-        <artifact:pom id="@{name}.pom" file="${path}-pom-filtered.xml" />
-
-        <if><equals arg1="@{signed}" arg2="false"/><then>
-          <if><equals arg1="@{local}" arg2="false"/><then>
-            <artifact:deploy file="${path}.jar" settingsFile="${settings.file}">
-              <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
-              <artifact:pom refid="@{name}.pom" />
-              <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
-              <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
-            </artifact:deploy>
-          </then><else>
-            <if><isset property="docs.skip"/><then>
-               <artifact:install file="${path}.jar">
-                 <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
-                 <artifact:pom refid="@{name}.pom" />
-                 <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
-               </artifact:install>
-            </then>
-            <else>
-              <artifact:install file="${path}.jar">
-                <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
-                <artifact:pom refid="@{name}.pom" />
-                <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
-              </artifact:install>
-            </else>
-            </if>
-          </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>
-            <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">
-      <attribute name="local"  default="false"/>
-      <attribute name="signed" default="false"/>
-
-      <sequential>
-        <deploy-one                name="scala-actors"   version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-compiler" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-library"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-reflect"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-swing"    version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scalap"         version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one dir="plugins/" name="continuations"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-      </sequential>
-    </macrodef>
   </target>
 
-  <target name="deploy"        depends="init" description="Deploys unsigned artifacts to the maven repo.">       <deploy/> </target>
-  <target name="deploy.local"  depends="init" description="Deploys unsigned artifacts to the local maven repo."> <deploy local="true"/> </target>
-  <target name="deploy.signed" depends="init" description="Deploys signed artifacts to the remote maven repo.">  <deploy signed="true"/> </target>
+  <target name="deploy"        depends="init.maven" description="Deploys unsigned artifacts to the maven repo.">       <deploy/> </target>
+  <target name="deploy.local"  depends="init.maven" description="Deploys unsigned artifacts to the local maven repo."> <deploy local="true"/> </target>
+  <target name="deploy.signed" depends="init.maven" description="Deploys signed artifacts to the remote maven repo.">  <deploy signed="true"/> </target>
 </project>
diff --git a/src/build/maven/plugins/continuations-pom.xml b/src/build/maven/plugins/continuations-pom.xml
index 9abb0a36f0..8dc79c8664 100644
--- a/src/build/maven/plugins/continuations-pom.xml
+++ b/src/build/maven/plugins/continuations-pom.xml
@@ -1,54 +1,51 @@
-<project
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.scala-lang.plugins</groupId>
-	<artifactId>continuations</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
+<?xml version="1.0"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.scala-lang.plugins</groupId>
+  <artifactId>continuations</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
   <name>Scala Continuations Plugin</name>
   <description>Delimited continuations compilation for Scala</description>
-	<url>http://www.scala-lang.org/</url>
-	<inceptionYear>2010</inceptionYear>
-	<organization>
-		<name>LAMP/EPFL</name>
-		<url>http://lamp.epfl.ch/</url>
-	</organization>
-	<licenses>
-		<license>
-			<name>BSD-like</name>
-			<url>http://www.scala-lang.org/downloads/license.html
-			</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-                <connection>scm:git:git://github.com/scala/scala.git</connection>
-                <url>https://github.com/scala/scala.git</url>
-	</scm>
-	<issueManagement>
-                <system>JIRA</system>
-                <url>https://issues.scala-lang.org/</url>
-	</issueManagement>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.scala-lang</groupId>
-			<artifactId>scala-compiler</artifactId>
-			<version>@VERSION@</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>scala-tools.org</id>
-			<url>@RELEASE_REPOSITORY@</url>
-		</repository>
-		<snapshotRepository>
-			<id>scala-tools.org</id>
-			<url>@SNAPSHOT_REPOSITORY@</url>
-			<uniqueVersion>false</uniqueVersion>
-		</snapshotRepository>
-	</distributionManagement>
+  <url>http://www.scala-lang.org/</url>
+  <inceptionYear>2010</inceptionYear>
+  <organization>
+    <name>LAMP/EPFL</name>
+    <url>http://lamp.epfl.ch/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD 3-Clause</name>
+      <url>http://www.scala-lang.org/license.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:git:git://github.com/scala/scala.git</connection>
+    <url>https://github.com/scala/scala.git</url>
+  </scm>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.scala-lang.org/</url>
+  </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-compiler</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <repository>
+      <id>scala-tools.org</id>
+      <url>@RELEASE_REPOSITORY@</url>
+    </repository>
+    <snapshotRepository>
+      <id>scala-tools.org</id>
+      <url>@SNAPSHOT_REPOSITORY@</url>
+      <uniqueVersion>false</uniqueVersion>
+    </snapshotRepository>
+  </distributionManagement>
   <developers>
     <developer>
       <id>lamp</id>
diff --git a/src/build/maven/scala-actors-pom.xml b/src/build/maven/scala-actors-pom.xml
index 3d37ef8174..424ac2898c 100644
--- a/src/build/maven/scala-actors-pom.xml
+++ b/src/build/maven/scala-actors-pom.xml
@@ -1,56 +1,54 @@
-<project
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.scala-lang</groupId>
-	<artifactId>scala-actors</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
+<?xml version="1.0"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.scala-lang</groupId>
+  <artifactId>scala-actors</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
   <name>Scala Actors library</name>
   <description>Deprecated Actors Library for Scala</description>
-  <url>http://www.scala-lang.org/</url>  
+  <url>http://www.scala-lang.org/</url>
   <inceptionYear>2006</inceptionYear>
   <organization>
-      <name>LAMP/EPFL</name>
-      <url>http://lamp.epfl.ch/</url>
-   </organization>
-   <licenses>
-      <license>
-         <name>BSD-like</name>
-         <url>http://www.scala-lang.org/downloads/license.html
-         </url>
-         <distribution>repo</distribution>
-      </license>
-   </licenses>
-   <scm>
-      <connection>scm:git:git://github.com/scala/scala.git</connection>
-      <url>https://github.com/scala/scala.git</url>
-   </scm>
-   <issueManagement>
-      <system>JIRA</system>
-      <url>https://issues.scala-lang.org/</url>
-   </issueManagement>	
-   <properties>
-       <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL>
-   </properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.scala-lang</groupId>
-			<artifactId>scala-library</artifactId>
-			<version>@VERSION@</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>scala-tools.org</id>
-			<url>@RELEASE_REPOSITORY@</url>
-		</repository>
-		<snapshotRepository>
-			<id>scala-tools.org</id>
-			<url>@SNAPSHOT_REPOSITORY@</url>
-			<uniqueVersion>false</uniqueVersion>
-		</snapshotRepository>
-	</distributionManagement>
+    <name>LAMP/EPFL</name>
+    <url>http://lamp.epfl.ch/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD 3-Clause</name>
+      <url>http://www.scala-lang.org/license.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:git:git://github.com/scala/scala.git</connection>
+    <url>https://github.com/scala/scala.git</url>
+  </scm>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.scala-lang.org/</url>
+  </issueManagement>
+  <properties>
+    <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <repository>
+      <id>scala-tools.org</id>
+      <url>@RELEASE_REPOSITORY@</url>
+    </repository>
+    <snapshotRepository>
+      <id>scala-tools.org</id>
+      <url>@SNAPSHOT_REPOSITORY@</url>
+      <uniqueVersion>false</uniqueVersion>
+    </snapshotRepository>
+  </distributionManagement>
   <developers>
     <developer>
       <id>lamp</id>
diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml
index 8cc42c22ae..442fe6a8d5 100644
--- a/src/build/maven/scala-compiler-pom.xml
+++ b/src/build/maven/scala-compiler-pom.xml
@@ -1,83 +1,82 @@
-<project
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.scala-lang</groupId>
-	<artifactId>scala-compiler</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
-	<name>Scala Compiler</name>
-	<description>Compiler for the Scala Programming Language</description>
-	<url>http://www.scala-lang.org/</url>
-	<inceptionYear>2002</inceptionYear>
-	<organization>
-		<name>LAMP/EPFL</name>
-		<url>http://lamp.epfl.ch/</url>
-	</organization>
-	<licenses>
-		<license>
-			<name>BSD-like</name>
-			<url>http://www.scala-lang.org/downloads/license.html
-			</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:git:git://github.com/scala/scala.git</connection>
-		<url>https://github.com/scala/scala.git</url>
-	</scm>
-	<issueManagement>
-		<system>JIRA</system>
-		<url>https://issues.scala-lang.org/</url>
-	</issueManagement>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.scala-lang</groupId>
-			<artifactId>scala-library</artifactId>
-			<version>@VERSION@</version>
-		</dependency>
-		<dependency> <!-- for scaladoc -->
-                <groupId>org.scala-lang.modules</groupId>
-                <artifactId>scala-xml_@SCALA_BINARY_VERSION@</artifactId>
-                <version>@XML_VERSION@</version>
-		</dependency>
-		<dependency> <!-- for scaladoc -->
-                <groupId>org.scala-lang.modules</groupId>
-                <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId>
-                <version>@PARSER_COMBINATORS_VERSION@</version>
-		</dependency>
-		<dependency>
-			<groupId>org.scala-lang</groupId>
-			<artifactId>scala-reflect</artifactId>
-			<version>@VERSION@</version>
-		</dependency>
-		<dependency>
-			<groupId>jline</groupId>
-			<artifactId>jline</artifactId>
-			<version>@JLINE_VERSION@</version>
-			<optional>true</optional>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>scala-tools.org</id>
-			<url>@RELEASE_REPOSITORY@</url>
-		</repository>
-		<snapshotRepository>
-			<id>scala-tools.org</id>
-			<url>@SNAPSHOT_REPOSITORY@</url>
-			<uniqueVersion>false</uniqueVersion>
-		</snapshotRepository>
-	</distributionManagement>
-	<developers>
-		<developer>
-			<id>lamp</id>
-			<name>EPFL LAMP</name>
-		</developer>
-		<developer>
-			<id>Typesafe</id>
-			<name>Typesafe, Inc.</name>
-		</developer>
-	</developers>
+<?xml version="1.0"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.scala-lang</groupId>
+  <artifactId>scala-compiler</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
+  <name>Scala Compiler</name>
+  <description>Compiler for the Scala Programming Language</description>
+  <url>http://www.scala-lang.org/</url>
+  <inceptionYear>2002</inceptionYear>
+  <organization>
+    <name>LAMP/EPFL</name>
+    <url>http://lamp.epfl.ch/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD 3-Clause</name>
+      <url>http://www.scala-lang.org/license.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:git:git://github.com/scala/scala.git</connection>
+    <url>https://github.com/scala/scala.git</url>
+  </scm>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.scala-lang.org/</url>
+  </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <!-- for scaladoc -->
+      <groupId>org.scala-lang.modules</groupId>
+      <artifactId>scala-xml_@SCALA_BINARY_VERSION@</artifactId>
+      <version>@XML_VERSION@</version>
+    </dependency>
+    <dependency>
+      <!-- for scaladoc -->
+      <groupId>org.scala-lang.modules</groupId>
+      <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId>
+      <version>@PARSER_COMBINATORS_VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-reflect</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+      <version>@JLINE_VERSION@</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <repository>
+      <id>scala-tools.org</id>
+      <url>@RELEASE_REPOSITORY@</url>
+    </repository>
+    <snapshotRepository>
+      <id>scala-tools.org</id>
+      <url>@SNAPSHOT_REPOSITORY@</url>
+      <uniqueVersion>false</uniqueVersion>
+    </snapshotRepository>
+  </distributionManagement>
+  <developers>
+    <developer>
+      <id>lamp</id>
+      <name>EPFL LAMP</name>
+    </developer>
+    <developer>
+      <id>Typesafe</id>
+      <name>Typesafe, Inc.</name>
+    </developer>
+  </developers>
 </project>
diff --git a/src/build/maven/scala-library-pom.xml b/src/build/maven/scala-library-pom.xml
index 684474e79a..d40cee2656 100644
--- a/src/build/maven/scala-library-pom.xml
+++ b/src/build/maven/scala-library-pom.xml
@@ -1,50 +1,48 @@
-<project
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.scala-lang</groupId>
-	<artifactId>scala-library</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
+<?xml version="1.0"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.scala-lang</groupId>
+  <artifactId>scala-library</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
   <name>Scala Library</name>
   <description>Standard library for the Scala Programming Language</description>
-	<url>http://www.scala-lang.org/</url>
-   <inceptionYear>2002</inceptionYear>
-   <organization>
-      <name>LAMP/EPFL</name>
-      <url>http://lamp.epfl.ch/</url>
-   </organization>
-   <licenses>
-      <license>
-         <name>BSD-like</name>
-         <url>http://www.scala-lang.org/downloads/license.html
-         </url>
-         <distribution>repo</distribution>
-      </license>
-   </licenses>
-   <scm>
-      <connection>scm:git:git://github.com/scala/scala.git</connection>
-      <url>https://github.com/scala/scala.git</url>
-   </scm>
-   <issueManagement>
-      <system>JIRA</system>
-      <url>https://issues.scala-lang.org/</url>
-   </issueManagement>
-   <properties>
-       <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL>
-   </properties>
-   <dependencies>
+  <url>http://www.scala-lang.org/</url>
+  <inceptionYear>2002</inceptionYear>
+  <organization>
+    <name>LAMP/EPFL</name>
+    <url>http://lamp.epfl.ch/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD 3-Clause</name>
+      <url>http://www.scala-lang.org/license.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:git:git://github.com/scala/scala.git</connection>
+    <url>https://github.com/scala/scala.git</url>
+  </scm>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.scala-lang.org/</url>
+  </issueManagement>
+  <properties>
+    <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL>
+  </properties>
+  <dependencies>
    </dependencies>
-   <distributionManagement>
-      <repository>
-         <id>scala-tools.org</id>
-         <url>@RELEASE_REPOSITORY@</url>
-      </repository>
-      <snapshotRepository>
-         <id>scala-tools.org</id>
-         <url>@SNAPSHOT_REPOSITORY@</url>
-         <uniqueVersion>false</uniqueVersion>
-      </snapshotRepository>
+  <distributionManagement>
+    <repository>
+      <id>scala-tools.org</id>
+      <url>@RELEASE_REPOSITORY@</url>
+    </repository>
+    <snapshotRepository>
+      <id>scala-tools.org</id>
+      <url>@SNAPSHOT_REPOSITORY@</url>
+      <uniqueVersion>false</uniqueVersion>
+    </snapshotRepository>
   </distributionManagement>
   <developers>
     <developer>
diff --git a/src/build/maven/scala-reflect-pom.xml b/src/build/maven/scala-reflect-pom.xml
index 56d2ffc57c..d0a9c0e274 100644
--- a/src/build/maven/scala-reflect-pom.xml
+++ b/src/build/maven/scala-reflect-pom.xml
@@ -1,56 +1,54 @@
-<project
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.scala-lang</groupId>
-	<artifactId>scala-reflect</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
+<?xml version="1.0"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.scala-lang</groupId>
+  <artifactId>scala-reflect</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
   <name>Scala Compiler</name>
   <description>Compiler for the Scala Programming Language</description>
-	<url>http://www.scala-lang.org/</url>
-	<inceptionYear>2002</inceptionYear>
-	<organization>
-		<name>LAMP/EPFL</name>
-		<url>http://lamp.epfl.ch/</url>
-	</organization>
-	<licenses>
-		<license>
-			<name>BSD-like</name>
-			<url>http://www.scala-lang.org/downloads/license.html
-			</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-                <connection>scm:git:git://github.com/scala/scala.git</connection>
-                <url>https://github.com/scala/scala.git</url>
-	</scm>
-	<issueManagement>
-                <system>JIRA</system>
-                <url>https://issues.scala-lang.org/</url>
-	</issueManagement>
+  <url>http://www.scala-lang.org/</url>
+  <inceptionYear>2002</inceptionYear>
+  <organization>
+    <name>LAMP/EPFL</name>
+    <url>http://lamp.epfl.ch/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD 3-Clause</name>
+      <url>http://www.scala-lang.org/license.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:git:git://github.com/scala/scala.git</connection>
+    <url>https://github.com/scala/scala.git</url>
+  </scm>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.scala-lang.org/</url>
+  </issueManagement>
   <properties>
-      <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL>
+    <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL>
   </properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.scala-lang</groupId>
-			<artifactId>scala-library</artifactId>
-			<version>@VERSION@</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>scala-tools.org</id>
-			<url>@RELEASE_REPOSITORY@</url>
-		</repository>
-		<snapshotRepository>
-			<id>scala-tools.org</id>
-			<url>@SNAPSHOT_REPOSITORY@</url>
-			<uniqueVersion>false</uniqueVersion>
-		</snapshotRepository>
-	</distributionManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <repository>
+      <id>scala-tools.org</id>
+      <url>@RELEASE_REPOSITORY@</url>
+    </repository>
+    <snapshotRepository>
+      <id>scala-tools.org</id>
+      <url>@SNAPSHOT_REPOSITORY@</url>
+      <uniqueVersion>false</uniqueVersion>
+    </snapshotRepository>
+  </distributionManagement>
   <developers>
     <developer>
       <id>lamp</id>
diff --git a/src/build/maven/scala-swing-pom.xml b/src/build/maven/scala-swing-pom.xml
index 5099fe11dc..01c89f9bea 100644
--- a/src/build/maven/scala-swing-pom.xml
+++ b/src/build/maven/scala-swing-pom.xml
@@ -1,56 +1,54 @@
-<project
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.scala-lang</groupId>
-	<artifactId>scala-swing</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
+<?xml version="1.0"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.scala-lang</groupId>
+  <artifactId>scala-swing</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
   <name>Scala Swing library</name>
   <description>Swing for Scala</description>
-	<url>http://www.scala-lang.org/</url>
-   <inceptionYear>2002</inceptionYear>
-   <organization>
-      <name>LAMP/EPFL</name>
-      <url>http://lamp.epfl.ch/</url>
-   </organization>
-   <licenses>
-      <license>
-         <name>BSD-like</name>
-         <url>http://www.scala-lang.org/downloads/license.html
-         </url>
-         <distribution>repo</distribution>
-      </license>
-   </licenses>
-   <scm>
-      <connection>scm:git:git://github.com/scala/scala.git</connection>
-      <url>https://github.com/scala/scala.git</url>
-   </scm>
-   <issueManagement>
-      <system>JIRA</system>
-      <url>https://issues.scala-lang.org/</url>
-   </issueManagement>	
-   <properties>
-       <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL>
-   </properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.scala-lang</groupId>
-			<artifactId>scala-library</artifactId>
-			<version>@VERSION@</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>scala-tools.org</id>
-			<url>@RELEASE_REPOSITORY@</url>
-		</repository>
-		<snapshotRepository>
-			<id>scala-tools.org</id>
-			<url>@SNAPSHOT_REPOSITORY@</url>
-			<uniqueVersion>false</uniqueVersion>
-		</snapshotRepository>
-	</distributionManagement>
+  <url>http://www.scala-lang.org/</url>
+  <inceptionYear>2002</inceptionYear>
+  <organization>
+    <name>LAMP/EPFL</name>
+    <url>http://lamp.epfl.ch/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD 3-Clause</name>
+      <url>http://www.scala-lang.org/license.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:git:git://github.com/scala/scala.git</connection>
+    <url>https://github.com/scala/scala.git</url>
+  </scm>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.scala-lang.org/</url>
+  </issueManagement>
+  <properties>
+    <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <repository>
+      <id>scala-tools.org</id>
+      <url>@RELEASE_REPOSITORY@</url>
+    </repository>
+    <snapshotRepository>
+      <id>scala-tools.org</id>
+      <url>@SNAPSHOT_REPOSITORY@</url>
+      <uniqueVersion>false</uniqueVersion>
+    </snapshotRepository>
+  </distributionManagement>
   <developers>
     <developer>
       <id>lamp</id>
diff --git a/src/build/maven/scalap-pom.xml b/src/build/maven/scalap-pom.xml
index 50c08e899c..88cfce08d8 100644
--- a/src/build/maven/scalap-pom.xml
+++ b/src/build/maven/scalap-pom.xml
@@ -1,54 +1,51 @@
-<project
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.scala-lang</groupId>
-	<artifactId>scalap</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
+<?xml version="1.0"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.scala-lang</groupId>
+  <artifactId>scalap</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
   <name>Scalap</name>
   <description>bytecode analysis tool</description>
-	<url>http://www.scala-lang.org/</url>
-	<inceptionYear>2002</inceptionYear>
-	<organization>
-		<name>LAMP/EPFL</name>
-		<url>http://lamp.epfl.ch/</url>
-	</organization>
-	<licenses>
-		<license>
-			<name>BSD-like</name>
-			<url>http://www.scala-lang.org/downloads/license.html
-			</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-                <connection>scm:git:git://github.com/scala/scala.git</connection>
-                <url>https://github.com/scala/scala.git</url>
-	</scm>
-	<issueManagement>
-                <system>JIRA</system>
-                <url>https://issues.scala-lang.org/</url>
-	</issueManagement>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.scala-lang</groupId>
-			<artifactId>scala-compiler</artifactId>
-			<version>@VERSION@</version>
-		</dependency>
-	</dependencies>
-	<distributionManagement>
-		<repository>
-			<id>scala-tools.org</id>
-			<url>@RELEASE_REPOSITORY@</url>
-		</repository>
-		<snapshotRepository>
-			<id>scala-tools.org</id>
-			<url>@SNAPSHOT_REPOSITORY@</url>
-			<uniqueVersion>false</uniqueVersion>
-		</snapshotRepository>
-	</distributionManagement>
+  <url>http://www.scala-lang.org/</url>
+  <inceptionYear>2002</inceptionYear>
+  <organization>
+    <name>LAMP/EPFL</name>
+    <url>http://lamp.epfl.ch/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD 3-Clause</name>
+      <url>http://www.scala-lang.org/license.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:git:git://github.com/scala/scala.git</connection>
+    <url>https://github.com/scala/scala.git</url>
+  </scm>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.scala-lang.org/</url>
+  </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-compiler</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <repository>
+      <id>scala-tools.org</id>
+      <url>@RELEASE_REPOSITORY@</url>
+    </repository>
+    <snapshotRepository>
+      <id>scala-tools.org</id>
+      <url>@SNAPSHOT_REPOSITORY@</url>
+      <uniqueVersion>false</uniqueVersion>
+    </snapshotRepository>
+  </distributionManagement>
   <developers>
     <developer>
       <id>lamp</id>
diff --git a/src/build/pack.xml b/src/build/pack.xml
deleted file mode 100644
index 4c5ba228fc..0000000000
--- a/src/build/pack.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="sabbus-pack">
-
-  <description>
-    SuperSabbus extension for packaging a distribution. THIS FILE IS NOT STAND-ALONE AND SHOULD ONLY BE USED THROUGH ENTRY POINTS IN SUPERSABBUS.
-  </description>
-  
-<!-- ===========================================================================
-PROPERTIES
-============================================================================ -->
-  
-  <!-- the maven stuff requires version.major, version.minor and version.patch properties.
-       the "get-scala-revision" script only returns "version.number" -->
-  <property file="${basedir}/build.number"/>
-  <!-- also need to know scala binary version and versions for xml and parsers -->
-  <property file="${basedir}/versions.properties"/>
-
-  
-<!-- ===========================================================================
-MAIN DISTRIBUTION PACKAGING
-============================================================================ -->
-  
-  <target name="pack-archives.start">
-    <mkdir dir="${dists.dir}/archives"/>
-  </target>
-  
-  <target name="pack-archives.tar" depends="pack-archives.start">
-    <tar destfile="${dists.dir}/archives/${dist.name}.tar"
-         compression="none" longfile="gnu">
-      <tarfileset dir="${dist.dir}" prefix="${dist.name}" includes="bin/**" mode="755"/>
-      <tarfileset dir="${dist.dir}" prefix="${dist.name}" excludes="bin/**"/>
-    </tar>
-    <gzip src="${dists.dir}/archives/${dist.name}.tar" destfile="${dists.dir}/archives/${dist.name}.tgz"/>
-    <if>
-      <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
-      <then>
-        <exec executable="xz" failifexecutionfails="false">
-          <arg line="-k -9e -S .xz ${dists.dir}/archives/${dist.name}.tar"/>
-        </exec>
-        <move file="${dists.dir}/archives/${dist.name}.tar.xz" tofile="${dists.dir}/archives/${dist.name}.txz" failonerror="false"/>
-      </then>
-    </if>
-    <delete file="${dists.dir}/archives/${dist.name}.tar" />
-    <checksum fileext=".md5">
-      <fileset dir="${dists.dir}/archives">
-        <include name="${dist.name}.t?z"/>
-      </fileset>
-    </checksum>
-  </target>
-  
-  <target name="pack-archives.zip" depends="pack-archives.tar">
-    <zip destfile="${dists.dir}/archives/${dist.name}.zip">
-      <zipfileset prefix="${dist.name}" dir="${dist.dir}"/>
-    </zip>
-    <checksum file="${dists.dir}/archives/${dist.name}.zip" fileext=".md5"/>
-  </target>
-
-  <target name="pack-devel-docs.tar" depends="pack-archives.zip" unless="docs.skip">
-    <tar destfile="${dists.dir}/archives/${dist.name}-devel-docs.tar"
-         compression="none" longfile="gnu">
-      <tarfileset dir="${dist.dir}/doc/scala-devel-docs" prefix="${dist.name}-devel-docs"/>
-    </tar>
-    <gzip src="${dists.dir}/archives/${dist.name}-devel-docs.tar" destfile="${dists.dir}/archives/${dist.name}-devel-docs.tgz"/>
-    <if>
-      <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
-      <then>
-        <exec executable="xz" failifexecutionfails="false">
-          <arg line="-k -9e -S .xz ${dists.dir}/archives/${dist.name}-devel-docs.tar"/>
-        </exec>
-        <move file="${dists.dir}/archives/${dist.name}-devel-docs.tar.xz" tofile="${dists.dir}/archives/${dist.name}-devel-docs.txz" failonerror="false"/>
-      </then>
-    </if>
-    <delete file="${dists.dir}/archives/${dist.name}-devel-docs.tar" />
-    <checksum fileext=".md5">
-      <fileset dir="${dists.dir}/archives">
-        <include name="${dist.name}-devel-docs.t?z"/>
-      </fileset>
-    </checksum>
-  </target>
-  
-  <target name="pack-archives.src" depends="pack-devel-docs.tar">
-    <tar destfile="${dists.dir}/archives/${dist.name}-sources.tar"
-         compression="none" longfile="gnu">
-      <tarfileset dir="${basedir}" prefix="${dist.name}-sources">
-        <exclude name="bin/**"/>
-        <exclude name="build/**"/>
-        <exclude name="debian/**"/>
-        <exclude name="dists/**"/>
-        <exclude name="logs/**"/>
-        <exclude name="sandbox/**"/>
-        <exclude name="test/partest"/>
-        <exclude name=".git"/>
-      </tarfileset>
-      <tarfileset dir="${basedir}" prefix="${dist.name}-sources" filemode="755">
-        <include name="test/partest"/>
-      </tarfileset>
-    </tar>
-    <gzip src="${dists.dir}/archives/${dist.name}-sources.tar" destfile="${dists.dir}/archives/${dist.name}-sources.tgz"/>
-    <if>
-      <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
-      <then>
-        <exec executable="xz" failifexecutionfails="false">
-          <arg line="-k -9e -S .xz ${dists.dir}/archives/${dist.name}-sources.tar"/>
-        </exec>
-        <move file="${dists.dir}/archives/${dist.name}-sources.tar.xz" tofile="${dists.dir}/archives/${dist.name}-sources.txz" failonerror="false"/>
-      </then>
-    </if>
-    <delete file="${dists.dir}/archives/${dist.name}-sources.tar" />
-    <checksum fileext=".md5">
-      <fileset dir="${dists.dir}/archives">
-        <include name="${dist.name}-sources.t?z"/>
-      </fileset>
-    </checksum>
-  </target>
-
-  <target name="pack-archives.latest.unix" depends="pack-archives.src" unless="os.win">
-    <!-- be sure to use a relative symlink to make the distribution portable,
-        `resource` is relative to directory of `link` -->
-    <symlink link="${dists.dir}/archives/scala-latest-sources.tgz"
-             resource="scala-${version.number}-sources.tgz"
-             overwrite="true"/>
-  </target>
-
-  <target name="pack-archives.latest.win" depends="pack-archives.src" if="os.win">
-    <copy tofile="${dists.dir}/archives/scala-latest-sources.tgz" overwrite="true">
-      <fileset dir="${dists.dir}/archives">
-         <include name="scala-${version.number}-sources.tgz"/>
-      </fileset>
-    </copy>
-  </target>
-  
-  <target name="pack-archives.done" depends="pack-archives.src, pack-archives.latest.win, pack-archives.latest.unix"/>
-
-  <target name="pack-maven.start">
-    <mkdir dir="${dists.dir}/maven/${version.number}"/>
-  </target>
-
-  <target name="pack-maven.libs" depends="pack-maven.start">
-    <macrodef name="mvn-copy-lib">
-      <attribute name="mvn.artifact.name"/>
-      <sequential>
-        <mkdir dir="${dists.dir}/maven/${version.number}/@{mvn.artifact.name}"/>
-        <copy verbose="true" overwrite="true" todir="${dists.dir}/maven/${version.number}/@{mvn.artifact.name}">
-          <fileset dir="${dist.dir}/lib/">
-            <filename name="@{mvn.artifact.name}.jar"/>
-          </fileset>
-          <fileset dir="${src.dir}/build/maven/">
-            <filename name="@{mvn.artifact.name}-pom.xml"/>
-          </fileset>
-          <fileset dir="${dist.dir}/src/">
-            <filename name="@{mvn.artifact.name}-src.jar"/>
-          </fileset>
-        </copy>
-      </sequential>
-    </macrodef>
-    <mvn-copy-lib mvn.artifact.name="scala-library"/>
-    <mvn-copy-lib mvn.artifact.name="scala-reflect"/>
-    <mvn-copy-lib mvn.artifact.name="scala-compiler"/>
-    <mvn-copy-lib mvn.artifact.name="scala-swing"/>
-    <mvn-copy-lib mvn.artifact.name="scala-actors"/>
-    <mvn-copy-lib mvn.artifact.name="scalap"/>
-  </target>
-
-  <target name="pack-maven.plugins" depends="pack-maven.start">
-    <macrodef name="mvn-copy-plugin">
-      <attribute name="mvn.artifact.name"/>
-      <sequential>
-        <mkdir dir="${dists.dir}/maven/${version.number}/plugins/@{mvn.artifact.name}"/>
-        <copy todir="${dists.dir}/maven/${version.number}/plugins/@{mvn.artifact.name}" overwrite="true">
-          <fileset dir="${dist.dir}/misc/scala-devel/plugins/">
-            <filename name="@{mvn.artifact.name}.jar"/>
-          </fileset>
-          <fileset dir="${src.dir}/build/maven/plugins/">
-            <filename name="@{mvn.artifact.name}-pom.xml"/>
-          </fileset>
-        </copy>
-      </sequential>
-    </macrodef>
-    <mvn-copy-plugin mvn.artifact.name="continuations"/>
-  </target>
-
-  <target name="pack-maven.srcs" depends="pack-maven.libs">
-    <!-- Add missing src jars. -->
-    <!-- Continuations plugin -->
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-src.jar"
-         basedir="${src.dir}/continuations/plugin">
-      <include name="**/*"/>
-    </jar>
-  </target>
-
-  <target name="pack-maven.docs" depends="pack-maven.libs, pack-maven.plugins" unless="docs.skip">
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"
-         basedir="${build-docs.dir}/library">
-      <include name="**/*"/>
-    </jar>
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-compiler/scala-compiler-docs.jar"
-         basedir="${build-docs.dir}/compiler">
-      <include name="**/*"/>
-    </jar>
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scalap/scalap-docs.jar"
-         basedir="${build-docs.dir}/scalap">
-      <include name="**/*"/>
-    </jar>
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-docs.jar"
-         basedir="${build-docs.dir}/continuations-plugin">
-      <include name="**/*"/>
-    </jar>
-
-    <!-- TODO - Scala swing and actors should maybe have thier own jar, but creating it is SLOW. -->
-    <copy tofile="${dists.dir}/maven/${version.number}/scala-swing/scala-swing-docs.jar"
-          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
-    <copy tofile="${dists.dir}/maven/${version.number}/scala-actors/scala-actors-docs.jar"
-          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
-    <copy tofile="${dists.dir}/maven/${version.number}/scala-reflect/scala-reflect-docs.jar"
-          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
-  </target>
-
-  <target name="pack-maven.latest.unix" depends="pack-maven.docs" unless="os.win">
-    <symlink link="${dists.dir}/maven/latest"
-             resource="${version.number}"
-             overwrite="true"/>
-  </target>
-
-  <target name="pack-maven.latest.win" depends="pack-maven.docs" if="os.win">
-    <copy todir="${dists.dir}/maven/latest" overwrite="true">
-      <fileset dir="${dists.dir}/maven/${version.number}"/>
-    </copy>
-  </target>
-
-  <target name="pack-maven.scripts" depends="pack-maven.latest.unix,pack-maven.latest.win,pack-maven.srcs">
-    <copy todir="${dists.dir}/maven/${version.number}"
-          file="${lib-ant.dir}/ant-contrib.jar" overwrite="true"/>
-    <copy todir="${dists.dir}/maven/${version.number}"
-          file="${lib-ant.dir}/maven-ant-tasks-2.1.1.jar" overwrite="true"/>
-    <copy tofile="${dists.dir}/maven/${version.number}/build.xml"
-          file="${src.dir}/build/maven/maven-deploy.xml"/>
-    <!-- export properties for use when deploying -->
-    <echoproperties destfile="${dists.dir}/maven/${version.number}/build.properties"/>
-  </target>
-
-  <target name="pack-maven.done" depends="pack-maven.scripts"/>
-
-<!-- ===========================================================================
-MISCELLANEOUS
-============================================================================ -->
-
-  <target name="pack-all.done" depends="pack-archives.done, pack-maven.done"/>
-
-<!-- ===========================================================================
-MISCELLANEOUS
-============================================================================ -->
-
-  <target name="graph.init">
-    <echo message="${basedir}/lib/ant/vizant.jar"/>
-    <taskdef name="vizant" classname="vizant.Vizant" classpath="${basedir}/../../lib/ant/vizant.jar"/>
-  </target>
-  
-  <target name="graph.pack" depends="graph.init">
-    <vizant antfile="${ant.file}" outfile="${ant.project.name}.dot"/>
-  </target>
-  
-</project>