From e465f07d944164a252636d1beae812e9e9ac23e2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 15 Nov 2016 00:24:46 +0100 Subject: [PATCH] Fix #21791 by adding exclusions scala packages in external moduls This patch fixes akka-stream's OSGi manifest by adding an explicit exclusion for scala.* packages known to have different versions, so they do not get expanded by scalaImport() and subsequent "*". Signed-off-by: Robert Varga --- project/OSGi.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/OSGi.scala b/project/OSGi.scala index 3018d7c284..6367c666cb 100644 --- a/project/OSGi.scala +++ b/project/OSGi.scala @@ -110,7 +110,8 @@ object OSGi { OsgiKeys.importPackage := imports ++ scalaVersion(defaultImports).value, OsgiKeys.exportPackage := packages ) - def defaultImports(scalaVersion: String) = Seq("!sun.misc", akkaImport(), configImport(), scalaImport(scalaVersion), "*") + def defaultImports(scalaVersion: String) = Seq("!sun.misc", akkaImport(), configImport(), "!scala.compat.java8.*", + "!scala.util.parsing.*", scalaImport(scalaVersion), "*") def akkaImport(packageName: String = "akka.*") = versionedImport(packageName, "2.4", "2.5") def configImport(packageName: String = "com.typesafe.config.*") = versionedImport(packageName, "1.3.0", "1.4.0") def scalaImport(version: String) = {