Remove scala-xml and scala-parser-combinators

These modules move to their own repositories:
  - https://github.com/scala/scala-xml (v1.0-RC3)
  - https://github.com/scala/scala-parser-combinators (v1.0-RC1)

The modularization depends on the new partest, as the old one's
classpath handling did not support a modularized scala.

The compiler pom now depends on the artifacts published separately,
with versions specified in versions.properties.

NOTES:
  - The osgi tests resolve the xml and parsers jars and osgi-fy them,
    as they are no longer built locally.
    TODO: Can we move the osgification to the module builds?
  - Disabled local repositories: don't want to accidentally include
    unpublished artifacts in releases etc.

6 files changed, 13 insertions, 143 deletions

diff --git a/src/build/dbuild-meta-json-gen.scala b/src/build/dbuild-meta-json-gen.scala
index 73eee8ac3a..78d4f3e65c 100644
--- a/src/build/dbuild-meta-json-gen.scala
+++ b/src/build/dbuild-meta-json-gen.scala
@@ -33,12 +33,6 @@ val meta =
     Project("scala-actors", "org.scala-lang",
       Seq(ProjectRef("scala-actors", "org.scala-lang")),
       Seq(ProjectRef("scala-library", "org.scala-lang"))),
-    Project("scala-xml", "org.scala-lang",
-      Seq(ProjectRef("scala-xml", "org.scala-lang")),
-      Seq(ProjectRef("scala-library", "org.scala-lang"))),
-    Project("scala-parser-combinators", "org.scala-lang",
-      Seq(ProjectRef("scala-parser-combinators", "org.scala-lang")),
-      Seq(ProjectRef("scala-library", "org.scala-lang"))),
 
     Project("scaladoc", "org.scala-lang",
       Seq(ProjectRef("scaladoc", "org.scala-lang")),
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index f52a7888ce..946b712b6c 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -55,6 +55,9 @@
         <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}" />
@@ -108,8 +111,6 @@
         <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-xml"      version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-parser-combinators"  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}"/>
diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml
index 6e7f1a0f2c..8cc42c22ae 100644
--- a/src/build/maven/scala-compiler-pom.xml
+++ b/src/build/maven/scala-compiler-pom.xml
@@ -38,14 +38,14 @@
 			<version>@VERSION@</version>
 		</dependency>
 		<dependency> <!-- for scaladoc -->
-			<groupId>org.scala-lang</groupId>
-			<artifactId>scala-xml</artifactId>
-			<version>@VERSION@</version>
+                <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</groupId>
-			<artifactId>scala-parser-combinators</artifactId>
-			<version>@VERSION@</version>
+                <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>
diff --git a/src/build/maven/scala-parser-combinators-pom.xml b/src/build/maven/scala-parser-combinators-pom.xml
deleted file mode 100644
index cddff269c8..0000000000
--- a/src/build/maven/scala-parser-combinators-pom.xml
+++ /dev/null
@@ -1,59 +0,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-parser-combinators</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
-  <name>Scala Parser Combinators</name>
-  <description>Parser Combinator 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>
-   </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-xml-pom.xml b/src/build/maven/scala-xml-pom.xml
deleted file mode 100644
index 629872c2e2..0000000000
--- a/src/build/maven/scala-xml-pom.xml
+++ /dev/null
@@ -1,59 +0,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-xml</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
-  <name>Scala XML</name>
-  <description>XML 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>
-   </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/pack.xml b/src/build/pack.xml
index fa030300ac..8e2d2f19fa 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -10,9 +10,12 @@
 PROPERTIES
 ============================================================================ -->
   
-  <property file="${basedir}/build.number.maven"/>
   <!-- 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.maven"/>
+  <!-- also need to know scala binary version and versions for xml and parsers -->
+  <property file="${basedir}/versions.properties"/>
+
   
 <!-- ===========================================================================
 MAIN DISTRIBUTION PACKAGING
@@ -152,8 +155,6 @@ MAIN DISTRIBUTION PACKAGING
       </sequential>
     </macrodef>
     <mvn-copy-lib mvn.artifact.name="scala-library"/>
-    <mvn-copy-lib mvn.artifact.name="scala-xml"/>
-    <mvn-copy-lib mvn.artifact.name="scala-parser-combinators"/>
     <mvn-copy-lib mvn.artifact.name="scala-reflect"/>
     <mvn-copy-lib mvn.artifact.name="scala-compiler"/>
     <mvn-copy-lib mvn.artifact.name="scala-swing"/>
@@ -193,14 +194,6 @@ MAIN DISTRIBUTION PACKAGING
          basedir="${build-docs.dir}/library">
       <include name="**/*"/>
     </jar>
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-xml/scala-xml-docs.jar"
-         basedir="${build-docs.dir}/xml">
-      <include name="**/*"/>
-    </jar>
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-parser-combinators/scala-parser-combinators-docs.jar"
-         basedir="${build-docs.dir}/parser-combinators">
-      <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="**/*"/>