From 5fd70ce4fbf5836dfee40c8e71161500c2864fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Albert?= <j.albert@data-in-motion.biz>
Date: Wed, 1 Nov 2023 10:06:44 +0100
Subject: [PATCH] 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>
---
 lib/build.gradle.kts                                | 13 ++++++++++++-
 lib/src/common/java/module-info.java                |  8 --------
 lib/src/intTest/java/module-info.java               |  9 ---------
 .../de/siegmar/fastcsv/reader/package-info.java     |  2 ++
 .../de/siegmar/fastcsv/writer/package-info.java     |  2 ++
 lib/src/main/java/module-info.java                  |  9 ---------
 6 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 lib/src/common/java/module-info.java
 delete mode 100644 lib/src/intTest/java/module-info.java
 delete mode 100644 lib/src/main/java/module-info.java

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 21c6d957..a53cb8ad 100644
--- 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
deleted file mode 100644
index aedd5030..00000000
--- a/lib/src/common/java/module-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-open module common {
-
-    requires de.siegmar.fastcsv;
-    requires org.assertj.core;
-
-    exports testutil;
-
-}
diff --git a/lib/src/intTest/java/module-info.java b/lib/src/intTest/java/module-info.java
deleted file mode 100644
index 105a575b..00000000
--- a/lib/src/intTest/java/module-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-open module blackbox {
-
-    requires common;
-    requires de.siegmar.fastcsv;
-    requires org.junit.jupiter.api;
-    requires org.junit.jupiter.params;
-    requires org.assertj.core;
-
-}
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
index b22d9e4a..c991239f 100644
--- 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
index 3f913e85..10cca260 100644
--- 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
deleted file mode 100644
index 3eabbee0..00000000
--- a/lib/src/main/java/module-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * FastCSV
- */
-module de.siegmar.fastcsv {
-
-    exports de.siegmar.fastcsv.reader;
-    exports de.siegmar.fastcsv.writer;
-
-}