From 8eff836dd2ba1760c6da6c7c23965f952401280f Mon Sep 17 00:00:00 2001 From: Oliver Heger Date: Tue, 15 May 2018 15:13:07 +0200 Subject: [PATCH] Fix for contradictory OSGi meta data in akka-stream #25055 --- project/OSGi.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/OSGi.scala b/project/OSGi.scala index 60a83182f0..457956cb92 100644 --- a/project/OSGi.scala +++ b/project/OSGi.scala @@ -92,8 +92,7 @@ object OSGi { packages = Seq( "akka.stream.*", "com.typesafe.sslconfig.akka.*"), - imports = Seq(scalaJava8CompatImport(), scalaParsingCombinatorImport())) ++ - Seq(OsgiKeys.requireBundle := Seq(s"""com.typesafe.sslconfig;bundle-version="${Dependencies.sslConfigVersion}"""")) + imports = Seq(scalaJava8CompatImport(), scalaParsingCombinatorImport(), sslConfigCoreImport())) val streamTestkit = exports(Seq("akka.stream.testkit.*")) @@ -127,7 +126,8 @@ object OSGi { versionedImport(packageName, s"$epoch.$major", s"$epoch.${major.toInt + 1}") } def scalaJava8CompatImport(packageName: String = "scala.compat.java8.*") = versionedImport(packageName, "0.7.0", "1.0.0") - def scalaParsingCombinatorImport(packageName: String = "scala.util.parsing.combinator.*") = versionedImport(packageName, "1.0.4", "1.1.0") + def scalaParsingCombinatorImport(packageName: String = "scala.util.parsing.combinator.*") = versionedImport(packageName, "1.1.0", "1.2.0") + def sslConfigCoreImport(packageName: String = "com.typesafe.sslconfig.*") = versionedImport(packageName, "0.2.3", "1.0.0") def kamonImport(packageName: String = "kamon.sigar.*") = optionalResolution(versionedImport(packageName, "1.6.5", "1.6.6")) def sigarImport(packageName: String = "org.hyperic.*") = optionalResolution(versionedImport(packageName, "1.6.5", "1.6.6")) def optionalResolution(packageName: String) = "%s;resolution:=optional".format(packageName)