You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2023/10/17 13:25:40 UTC
[incubator-pekko] branch main updated: Fix OSGI protobuf bug
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git
The following commit(s) were added to refs/heads/main by this push:
new c5611ec0d8 Fix OSGI protobuf bug
c5611ec0d8 is described below
commit c5611ec0d812c8a7e8a4587c5a7a2451b8eaaa97
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Thu Oct 12 11:29:12 2023 -0300
Fix OSGI protobuf bug
---
project/OSGi.scala | 4 +++-
project/plugins.sbt | 4 +---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/project/OSGi.scala b/project/OSGi.scala
index bafd5ede1c..0475efc657 100644
--- a/project/OSGi.scala
+++ b/project/OSGi.scala
@@ -40,7 +40,9 @@ object OSGi {
OsgiKeys.privatePackage := Seq(),
// Explicitly specify the version of JavaSE required #23795 (rather depend on
// figuring that out from the JDK it was built with)
- OsgiKeys.requireCapability := "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version>=1.8))\"")
+ OsgiKeys.requireCapability := "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version>=1.8))\"",
+ // Recent versions of BND create corrupted jars so use JDK jar instead, see https://github.com/sbt/sbt-osgi/pull/81
+ OsgiKeys.packageWithJVMJar := true)
val actor = osgiSettings ++ Seq(
OsgiKeys.exportPackage := Seq("org.apache.pekko*"),
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 87dc0d0820..68418ce3d3 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -13,9 +13,7 @@ addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
-// sbt-osgi 0.9.5 is available but breaks including jdk9-only classes
-// sbt-osgi 0.9.6 is available but breaks populating pekko-protobuf-v3
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
+addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.9.7")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org