raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Fix for contradictory OSGi meta data in akka-stream #25055

Browse source
This commit is contained in:
Oliver Heger 2018-05-15 15:13:07 +02:00 • committed by Johan Andrén
parent 19f23514f6
commit 8eff836dd2
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
project/OSGi.scala
View file

@ -92,8 +92,7 @@ object OSGi {
packages = Seq( packages = Seq(
"akka.stream.*", "akka.stream.*",
"com.typesafe.sslconfig.akka.*"), "com.typesafe.sslconfig.akka.*"),
imports = Seq(scalaJava8CompatImport(), scalaParsingCombinatorImport())) ++ imports = Seq(scalaJava8CompatImport(), scalaParsingCombinatorImport(), sslConfigCoreImport()))
Seq(OsgiKeys.requireBundle := Seq(s"""com.typesafe.sslconfig;bundle-version="${Dependencies.sslConfigVersion}""""))
val streamTestkit = exports(Seq("akka.stream.testkit.*")) val streamTestkit = exports(Seq("akka.stream.testkit.*"))
@ -127,7 +126,8 @@ object OSGi {
versionedImport(packageName, s"$epoch.$major", s"$epoch.${major.toInt + 1}") 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 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 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 sigarImport(packageName: String = "org.hyperic.*") = optionalResolution(versionedImport(packageName, "1.6.5", "1.6.6"))
def optionalResolution(packageName: String) = "%s;resolution:=optional".format(packageName) def optionalResolution(packageName: String) = "%s;resolution:=optional".format(packageName)