From 1b216b28d465ae94f4e1b69199e086efdda28869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Sun, 15 Oct 2017 18:39:58 +0200 Subject: [PATCH] Eplicit Java version requirement for OSGi #23795 (#23813) --- project/OSGi.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/project/OSGi.scala b/project/OSGi.scala index b1509e5ebc..c946ca4c94 100644 --- a/project/OSGi.scala +++ b/project/OSGi.scala @@ -20,7 +20,11 @@ object OSGi { // Each package contained in a project MUST be known to be private or exported, if it's undecided we MUST resolve this OsgiKeys.failOnUndecidedPackage := true, // By default an entry is generated from module group-id, but our modules do not adhere to such package naming - OsgiKeys.privatePackage := Seq()) + 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))\"" + ) val actor = osgiSettings ++ Seq( OsgiKeys.exportPackage := Seq("akka*"),