LOG4J2-2295: Add OSGi metadata to release jars
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/commit/59f47b87 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/59f47b87 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/59f47b87 Branch: refs/heads/master Commit: 59f47b878d1a80978653e2b790d581717a180afc Parents: 798a5cb Author: Matt Sicker <[email protected]> Authored: Mon Apr 2 10:56:50 2018 -0500 Committer: Matt Sicker <[email protected]> Committed: Mon Apr 2 10:56:50 2018 -0500 ---------------------------------------------------------------------- build.sbt | 14 +++++++------- project/plugins.sbt | 2 +- src/asciidoctor/changes.adoc | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/59f47b87/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index b91cbb0..5bb6b15 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ * limitations under the license. */ import Dependencies._ -//import OsgiKeys._ +import OsgiKeys._ enablePlugins(org.apache.logging.log4j.scala.sbt.copyresources.CopyResourcesPlugin) @@ -108,10 +108,10 @@ lazy val apiDependencies = Seq( ) ) -//lazy val bundleSettings = osgiSettings ++ Seq( -// bundleSymbolicName := "org.apache.logging.log4j.scala", -// exportPackage := Seq("org.apache.logging.log4j.scala") -//) +lazy val bundleSettings = osgiSettings ++ Seq( + bundleSymbolicName := "org.apache.logging.log4j.scala", + exportPackage := Seq("org.apache.logging.log4j.scala") +) lazy val root = (project in file(".")) .settings(name := "log4j-api-scala") @@ -124,8 +124,8 @@ lazy val root = (project in file(".")) .settings(apiDependencies: _*) .enablePlugins(AsciidoctorPlugin) .enablePlugins(SiteScaladocPlugin) -// .enablePlugins(SbtOsgi) -// .settings(bundleSettings: _*) + .enablePlugins(SbtOsgi) + .settings(bundleSettings: _*) //lazy val nopublish = Seq( // publish := {}, http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/59f47b87/project/plugins.sbt ---------------------------------------------------------------------- diff --git a/project/plugins.sbt b/project/plugins.sbt index e50648c..2701fb5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -19,5 +19,5 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.8") addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0") -//addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3") +addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3") addSbtPlugin("org.musigma" % "sbt-rat" % "0.2") http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/59f47b87/src/asciidoctor/changes.adoc ---------------------------------------------------------------------- diff --git a/src/asciidoctor/changes.adoc b/src/asciidoctor/changes.adoc index 748b0e9..fabd482 100644 --- a/src/asciidoctor/changes.adoc +++ b/src/asciidoctor/changes.adoc @@ -21,6 +21,7 @@ [vertical] New Features:: [horizontal] +LOG4J2-2295::: Add OSGi metadata to release jars. LOG4J2-2294::: Add release audit information to build. LOG4J2-2298::: Add changelog to site. LOG4J2-2293::: Add required license files to SBT output artifacts.
