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.

Author: adriaanm

build.xml

@@ -86,42 +86,6 @@
             "name": "scala-actors",
             "organization": "org.scala-lang"
         },
-        {
-            "artifacts": [
-                {
-                    "extension": "jar",
-                    "name": "scala-xml",
-                    "organization": "org.scala-lang"
-                }
-            ],
-            "dependencies": [
-                {
-                    "extension": "jar",
-                    "name": "scala-library",
-                    "organization": "org.scala-lang"
-                }
-            ],
-            "name": "scala-xml",
-            "organization": "org.scala-lang"
-        },
-        {
-            "artifacts": [
-                {
-                    "extension": "jar",
-                    "name": "scala-parser-combinators",
-                    "organization": "org.scala-lang"
-                }
-            ],
-            "dependencies": [
-                {
-                    "extension": "jar",
-                    "name": "scala-library",
-                    "organization": "org.scala-lang"
-                }
-            ],
-            "name": "scala-parser-combinators",
-            "organization": "org.scala-lang"
-        },
         {
             "artifacts": [
                 {

dbuild-meta.json

@@ -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")),

src/build/dbuild-meta-json-gen.scala

@@ -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}"/>

src/build/maven/maven-deploy.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>

src/build/maven/scala-compiler-pom.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="**/*"/>