From f4dd0ac79dd75d46c44c11b7fc8a3ee754491458 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Mon, 15 Oct 2018 15:41:00 +0200 Subject: [PATCH] Avoid incorrect OSGi dep on sslconfig.akka (#25580) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Importing com.typesafe.sslconfig.* with the sslconfig version results in OSGi bundle imports which also include com.typesafe.sslconfig.akka, which can’t be satisfied with the given version range. Splitting up the imported packages (com.typesafe.sslconfig, com.typesafe.sslconfig.ssl.*, com.typesafe.sslconfig.util.*) results in tighter-scoped imports which can be satisfied. This fixes #25579. Signed-off-by: Stephen Kitt --- project/OSGi.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/project/OSGi.scala b/project/OSGi.scala index cce473243d..5262ade6d5 100644 --- a/project/OSGi.scala +++ b/project/OSGi.scala @@ -92,7 +92,7 @@ object OSGi { packages = Seq( "akka.stream.*", "com.typesafe.sslconfig.akka.*"), - imports = Seq(scalaJava8CompatImport(), scalaParsingCombinatorImport(), sslConfigCoreImport())) + imports = Seq(scalaJava8CompatImport(), scalaParsingCombinatorImport(), sslConfigCoreImport(), sslConfigCoreSslImport(), sslConfigCoreUtilImport())) val streamTestkit = exports(Seq("akka.stream.testkit.*")) @@ -127,7 +127,9 @@ object OSGi { } 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.1.0", "1.2.0") - def sslConfigCoreImport(packageName: String = "com.typesafe.sslconfig.*") = versionedImport(packageName, "0.2.3", "1.0.0") + def sslConfigCoreImport(packageName: String = "com.typesafe.sslconfig") = versionedImport(packageName, "0.2.3", "1.0.0") + def sslConfigCoreSslImport(packageName: String = "com.typesafe.sslconfig.ssl.*") = versionedImport(packageName, "0.2.3", "1.0.0") + def sslConfigCoreUtilImport(packageName: String = "com.typesafe.sslconfig.util.*") = 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)