Suggestion for using bnd plugin for JPMS and OSGi Metadata (#92)

Signed-off-by: Juergen Albert <j.albertta-in-motion.biz> Co-authored-by: Juergen Albert <j.albertta-in-motion.biz>
osiegmar · Nov 1, 2023 · 5fd70ce · 5fd70ce
1 parent 02a0a23
commit 5fd70ce
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 27 deletions.
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -9,8 +9,9 @@ plugins {
     id("me.champeau.jmh") version "0.7.1"
     id("info.solidsoft.pitest") version "1.9.11"
     id("ru.vyarus.animalsniffer") version "1.7.1"
+    id("biz.aQute.bnd.builder") version "6.4.0"
 }
-
+ 
 group = "de.siegmar"
 version = "3.0.0-SNAPSHOT"
 
@@ -51,6 +52,8 @@ configurations[intTest.implementationConfigurationName].extendsFrom(configuratio
 configurations[intTest.runtimeOnlyConfigurationName].extendsFrom(configurations.testRuntimeOnly.get())
 
 dependencies {
+    compileOnly("org.osgi:org.osgi.annotation.bundle:1.1.0")
+    compileOnly("org.osgi:org.osgi.annotation.versioning:1.1.2")
     commonImplementation("org.assertj:assertj-core:3.24.2")
 
     testImplementation(platform("org.junit:junit-bom:5.9.3"))
@@ -119,6 +122,14 @@ tasks.jmh {
     operationsPerInvocation = 1
 }
 
+tasks.jar {
+    manifest {
+        attributes("Bundle-SymbolicName" to "de.siegmar.fastcsv",
+                "-removeheaders" to "Private-Package",
+                "-jpms-module-info" to "")
+    }
+}
+
 animalsniffer {
     sourceSets = listOf(project.sourceSets.main.get())
 }

diff --git a/lib/src/common/java/module-info.java b/lib/src/common/java/module-info.java
diff --git a/lib/src/intTest/java/module-info.java b/lib/src/intTest/java/module-info.java
diff --git a/lib/src/main/java/de/siegmar/fastcsv/reader/package-info.java b/lib/src/main/java/de/siegmar/fastcsv/reader/package-info.java
@@ -5,4 +5,6 @@
  * and higher level (name/header based) reader via
  * {@link de.siegmar.fastcsv.reader.NamedCsvReader#builder()}.
  */
+@org.osgi.annotation.versioning.Version("2.2.2")
+@org.osgi.annotation.bundle.Export
 package de.siegmar.fastcsv.reader;
diff --git a/lib/src/main/java/de/siegmar/fastcsv/writer/package-info.java b/lib/src/main/java/de/siegmar/fastcsv/writer/package-info.java
@@ -3,4 +3,6 @@
  * <p>
  * Obtain writer via {@link de.siegmar.fastcsv.writer.CsvWriter#builder()}.
  */
+@org.osgi.annotation.versioning.Version("2.2.2")
+@org.osgi.annotation.bundle.Export
 package de.siegmar.fastcsv.writer;
diff --git a/lib/src/main/java/module-info.java b/lib/src/main/java/module-info.java