15 files changed, 31 insertions, 120 deletions
diff --git a/src/build/bnd/scala-actors.bnd b/src/build/bnd/scala-actors.bnd
deleted file mode 100644
index 69885fc2bf..0000000000
--- a/src/build/bnd/scala-actors.bnd
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-Name: Scala Actors
-Bundle-SymbolicName: org.scala-lang.scala-actors
-ver: @VERSION@
-Bundle-Version: ${ver}
-Export-Package: *;version=${ver}
-Import-Package: scala.*;version="${range;[==,=+);${ver}}",*
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
diff --git a/src/build/bnd/scala-compiler-doc.bnd b/src/build/bnd/scala-compiler-doc.bnd
index 9d6d0304d1..5b662e8cef 100644
--- a/src/build/bnd/scala-compiler-doc.bnd
+++ b/src/build/bnd/scala-compiler-doc.bnd
@@ -4,4 +4,5 @@ ver: @SCALA_COMPILER_DOC_VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
 Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",*
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Include-Resource: @@SOURCE_JARNAME@
diff --git a/src/build/bnd/scala-compiler-interactive.bnd b/src/build/bnd/scala-compiler-interactive.bnd
index 07e3de35b0..fbfff60801 100644
--- a/src/build/bnd/scala-compiler-interactive.bnd
+++ b/src/build/bnd/scala-compiler-interactive.bnd
@@ -4,4 +4,5 @@ ver: @SCALA_COMPILER_INTERACTIVE_VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
 Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",*
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Include-Resource: @@SOURCE_JARNAME@
diff --git a/src/build/bnd/scala-compiler.bnd b/src/build/bnd/scala-compiler.bnd
index 2bd24d780d..3e60c4973c 100644
--- a/src/build/bnd/scala-compiler.bnd
+++ b/src/build/bnd/scala-compiler.bnd
@@ -9,4 +9,5 @@ Import-Package: jline.*;resolution:=optional, \
                 scala.xml.*;version="${range;[====,====];@XML_VERSION@}";resolution:=optional, \
                 scala.*;version="${range;[==,=+);${ver}}", \
                 *
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Include-Resource: @@SOURCE_JARNAME@
diff --git a/src/build/bnd/scala-continuations-library.bnd b/src/build/bnd/scala-continuations-library.bnd
deleted file mode 100644
index b36718cc5b..0000000000
--- a/src/build/bnd/scala-continuations-library.bnd
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-Name: Scala Delimited Continuations Library
-Bundle-SymbolicName: org.scala-lang.plugins.scala-continuations-library
-ver: @CONTINUATIONS_LIBRARY_VERSION@
-Bundle-Version: ${ver}
-Export-Package: *;version=${ver}
-Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",*
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
diff --git a/src/build/bnd/scala-continuations-plugin.bnd b/src/build/bnd/scala-continuations-plugin.bnd
deleted file mode 100644
index 2f2464b452..0000000000
--- a/src/build/bnd/scala-continuations-plugin.bnd
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-Name: Scala Delimited Continuations Compiler Plugin
-Bundle-SymbolicName: org.scala-lang.plugins.scala-continuations-plugin
-ver: @CONTINUATIONS_PLUGIN_VERSION@
-Bundle-Version: ${ver}
-Export-Package: *;version=${ver}
-Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",*
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
diff --git a/src/build/bnd/scala-library.bnd b/src/build/bnd/scala-library.bnd
index 7eb4fa4b2a..e211c5d1ad 100644
--- a/src/build/bnd/scala-library.bnd
+++ b/src/build/bnd/scala-library.bnd
@@ -4,4 +4,5 @@ ver: @VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
 Import-Package: sun.misc;resolution:=optional, *
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Include-Resource: @@SOURCE_JARNAME@
diff --git a/src/build/bnd/scala-parser-combinators.bnd b/src/build/bnd/scala-parser-combinators.bnd
index ef8646cbd0..515084f4a8 100644
--- a/src/build/bnd/scala-parser-combinators.bnd
+++ b/src/build/bnd/scala-parser-combinators.bnd
@@ -4,4 +4,5 @@ ver: @PARSER_COMBINATORS_VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
 Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",*
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Include-Resource: @@SOURCE_JARNAME@
diff --git a/src/build/bnd/scala-reflect.bnd b/src/build/bnd/scala-reflect.bnd
index e4bc54e52e..59db311f8d 100644
--- a/src/build/bnd/scala-reflect.bnd
+++ b/src/build/bnd/scala-reflect.bnd
@@ -6,4 +6,5 @@ Export-Package: *;version=${ver}
 Import-Package: scala.*;version="${range;[==,=+);${ver}}", \
                 scala.tools.nsc;resolution:=optional;version="${range;[==,=+);${ver}}", \
                 *
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Include-Resource: @@SOURCE_JARNAME@
diff --git a/src/build/bnd/scala-swing.bnd b/src/build/bnd/scala-swing.bnd
index f8b50baa91..24cd9f6f90 100644
--- a/src/build/bnd/scala-swing.bnd
+++ b/src/build/bnd/scala-swing.bnd
@@ -4,4 +4,5 @@ ver: @SCALA_SWING_VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
 Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",*
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6,JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Include-Resource: @@SOURCE_JARNAME@
diff --git a/src/build/bnd/scala-xml.bnd b/src/build/bnd/scala-xml.bnd
index 01bf0144eb..b7b19824e8 100644
--- a/src/build/bnd/scala-xml.bnd
+++ b/src/build/bnd/scala-xml.bnd
@@ -4,4 +4,5 @@ ver: @XML_VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
 Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",*
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Include-Resource: @@SOURCE_JARNAME@
diff --git a/src/build/dbuild-meta-json-gen.scala b/src/build/dbuild-meta-json-gen.scala
index d1d4c12b3f..043ad19b2e 100644
--- a/src/build/dbuild-meta-json-gen.scala
+++ b/src/build/dbuild-meta-json-gen.scala
@@ -1,16 +1,22 @@
-// use this script to generate dbuild-meta.json
-// make sure the version is specified correctly,
-// update the dependency structure and
-// check out distributed-build and run `sbt console`:
-// TODO: also generate build.xml and eclipse config from a similar data-structure
+// Use this script to generate dbuild-meta.json
 
-import distributed.project.model._
+// To generate the file:
+//  - check out https://github.com/typesafehub/dbuild
+//  - run `sbt metadata/console`
+//  - paste the code below
+
+// The `version` field is required for the ProjMeta data structure. However, dbuild will
+// overwrite the version specified here with the version number found in the build.number
+// file, so the actual value doesn't matter, see ScalaBuildSystem:
+// https://github.com/typesafehub/dbuild/blob/25b087759cc52876712c594ea4172148beea1310/support/src/main/scala/com/typesafe/dbuild/support/scala/ScalaBuildSystem.scala#L351
+
+import com.typesafe.dbuild.model._
 
 val meta =
-  ExtractedBuildMeta("2.11.0", Seq(
+  ProjMeta(version = "2.12.0", projects = Seq(
     Project("scala-library", "org.scala-lang",
       Seq(ProjectRef("scala-library", "org.scala-lang")),
-      Seq.empty), // TODO: forkjoin
+      Seq.empty),
     Project("scala-reflect", "org.scala-lang",
       Seq(ProjectRef("scala-reflect", "org.scala-lang")),
       Seq(ProjectRef("scala-library", "org.scala-lang"))),
@@ -19,7 +25,6 @@ val meta =
       Seq(ProjectRef("scala-reflect", "org.scala-lang"),
           ProjectRef("scala-xml", "org.scala-lang.modules"),
           ProjectRef("scala-parser-combinators", "org.scala-lang.modules")
-          // asm
          )),
 
     // Project("scala-repl", "org.scala-lang",
@@ -30,10 +35,6 @@ val meta =
     //   Seq(ProjectRef("scala-interactive", "org.scala-lang")),
     //   Seq(ProjectRef("scala-compiler", "org.scala-lang"), ProjectRef("scaladoc", "org.scala-lang"))),
 
-    Project("scala-actors", "org.scala-lang",
-      Seq(ProjectRef("scala-actors", "org.scala-lang")),
-      Seq(ProjectRef("scala-library", "org.scala-lang"))),
-
     // Project("scaladoc", "org.scala-lang",
     //   Seq(ProjectRef("scaladoc", "org.scala-lang")),
     //   Seq(ProjectRef("scala-compiler", "org.scala-lang"),ProjectRef("scala-partest", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"), ProjectRef("scala-parser-combinators", "org.scala-lang"))),
@@ -44,4 +45,4 @@ val meta =
 
   ))
 
-println(Utils.writeValue(meta))
+println(Utils.writeValueFormatted(meta))
diff --git a/src/build/maven/scala-actors-pom.xml b/src/build/maven/scala-actors-pom.xml
deleted file mode 100644
index 37500bf9ae..0000000000
--- a/src/build/maven/scala-actors-pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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>
-  <inceptionYear>2006</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>
-  <developers>
-    <developer>
-      <id>lamp</id>
-      <name>EPFL LAMP</name>
-    </developer>
-    <developer>
-      <id>Lightbend</id>
-      <name>Lightbend, Inc.</name>
-    </developer>
-  </developers>
-</project>
diff --git a/src/build/maven/scala-dist-pom.xml b/src/build/maven/scala-dist-pom.xml
index 6788ff0106..ce511661b0 100644
--- a/src/build/maven/scala-dist-pom.xml
+++ b/src/build/maven/scala-dist-pom.xml
@@ -44,12 +44,6 @@
       <artifactId>scalap</artifactId>
       <version>@VERSION@</version>
     </dependency>
-    <dependency>
-      <groupId>org.scala-lang.plugins</groupId>
-      <!-- plugins are fully cross-versioned. But, we don't publish with 2.11.0-SNAPSHOT, instead use full version of the last non-snapshot version -->
-      <artifactId>scala-continuations-plugin_@SCALA_FULL_VERSION@</artifactId>
-      <version>@CONTINUATIONS_PLUGIN_VERSION@</version>
-    </dependency>
     <!-- duplicated from scala-compiler, where it's optional,
     so that resolving scala-dist's transitive dependencies does not include jline,
     even though we need to include it in the dist, but macros depending on the compiler
diff --git a/src/build/maven/scala-library-all-pom.xml b/src/build/maven/scala-library-all-pom.xml
index 1991bae131..4620c620dc 100644
--- a/src/build/maven/scala-library-all-pom.xml
+++ b/src/build/maven/scala-library-all-pom.xml
@@ -49,31 +49,11 @@
       <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId>
       <version>@PARSER_COMBINATORS_VERSION@</version>
     </dependency>
-    <!--
-         the continuations plugin is a dependency of scala-dist, as scala-library-all should be
-         a drop-in replacement for scala-library, and as such should not (indirectly)
-         depend on plugins/the compiler.
-    -->
-    <dependency>
-      <groupId>org.scala-lang.plugins</groupId>
-      <artifactId>scala-continuations-library_@SCALA_BINARY_VERSION@</artifactId>
-      <version>@CONTINUATIONS_LIBRARY_VERSION@</version>
-    </dependency>
     <dependency>
       <groupId>org.scala-lang.modules</groupId>
       <artifactId>scala-swing_@SCALA_BINARY_VERSION@</artifactId>
       <version>@SCALA_SWING_VERSION@</version>
     </dependency>
-    <dependency>
-      <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-actor_@SCALA_BINARY_VERSION@</artifactId>
-      <version>@AKKA_ACTOR_VERSION@</version>
-    </dependency>
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-actors-migration_@SCALA_BINARY_VERSION@</artifactId>
-      <version>@ACTORS_MIGRATION_VERSION@</version>
-    </dependency>
   </dependencies>
   <developers>
     <developer>