Fixed Invalid CEN extra data field on recent JVM

src/main/scala/com/typesafe/sbt/osgi/Osgi.scala

@@ -44,7 +44,8 @@ private object Osgi {
     failOnUndecidedPackage: Boolean,
     sourceDirectories: Seq[File],
     packageOptions: scala.Seq[sbt.PackageOption],
-    streams: TaskStreams): File = {
+    streams: TaskStreams,
+    useJVMJar: Boolean): File = {
     val builder = new Builder
 
     if (failOnUndecidedPackage) {
@@ -75,7 +76,23 @@ private object Osgi {
     val log = streams.log
     builder.getWarnings.asScala.foreach(s => log.warn(s"bnd: $s"))
     builder.getErrors.asScala.foreach(s => log.error(s"bnd: $s"))
-    jar.write(tmpArtifactPath)
+
+    if (!useJVMJar) jar.write(tmpArtifactPath)
+    else {
+      val tmpArtifactDirectoryPath = file(artifactPath.absolutePath + "_tmpdir")
+      IO.delete(tmpArtifactDirectoryPath)
+      tmpArtifactDirectoryPath.mkdirs()
+
+      val manifest = jar.getManifest
+      jar.writeFolder(tmpArtifactDirectoryPath)
+
+      def content =
+        sbt.Path.contentOf(tmpArtifactDirectoryPath).filterNot { case (_, p) => p == "META-INF/MANIFEST.MF" }
+
+      IO.jar(content, tmpArtifactPath, manifest)
+      IO.delete(tmpArtifactDirectoryPath)
+    }
+
     IO.move(tmpArtifactPath, artifactPath)
     artifactPath
   }

src/main/scala/com/typesafe/sbt/osgi/OsgiKeys.scala

@@ -103,6 +103,10 @@ object OsgiKeys {
     SettingKey[Boolean](prefix("FailOnUndecidedPackage"), "Fail the build if a package is neither exported or private." +
       "Without this setting such classes might be just transparently removed from the resulting artifact!")
 
+  val packageWithJVMJar: SettingKey[Boolean] =
+    SettingKey[Boolean](prefix("PackageWithJVMJar"), "Use the JVM jar tools to craft the bundle instead of the one from BND." +
+      "Without this setting the produced bundle are detected as corrupted by recent JVMs")
+
   private def prefix(key: String) = "osgi" + key
 
 }

src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala

@@ -52,7 +52,8 @@ object SbtOsgi extends AutoPlugin {
         failOnUndecidedPackage.value,
         (sourceDirectories in Compile).value,
         (packageOptions in (Compile, packageBin)).value,
-        streams.value),
+        streams.value,
+        packageWithJVMJar.value),
       manifestHeaders := OsgiManifestHeaders(
         bundleActivator.value,
         description.value,
@@ -84,6 +85,7 @@ object SbtOsgi extends AutoPlugin {
       requireCapability := Osgi.requireCapabilityTask(),
       additionalHeaders := Map.empty,
       embeddedJars := Nil,
-      explodedJars := Nil)
+      explodedJars := Nil,
+      packageWithJVMJar := false)
   }
 }