mattjlewis · stbischof · Sep 30, 2021 · Sep 30, 2021
diff --git a/diozero-core/diozero-core-1.3.2_compare.jar b/diozero-core/diozero-core-1.3.2_compare.jar
diff --git a/diozero-core/pom.xml b/diozero-core/pom.xml
@@ -35,23 +35,64 @@
  </compilerArgs>
  </configuration>
  </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>5.3.0</version>
+ <configuration><bnd><![CDATA[
+ Bundle-SymbolicName: ${groupId}.${artifactId}
+
+ # default ARM processor is armv7 but you could explicit specify your framework at start using
+ # -Dorg.osgi.framework.processor=armv6 or -Dorg.osgi.framework.processor=armv7
+ Bundle-NativeCode: lib/linux-aarch64/libdiozero-system-utils.so; osname=Linux; processor=aarch64,\
+ lib/linux-armv7/libdiozero-system-utils.so; osname=Linux; processor=ARM,\
+ lib/linux-armv6/libdiozero-system-utils.so; osname=Linux; processor=armv6,\
+ lib/linux-armv7/libdiozero-system-utils.so; osname=Linux; processor=armv7,\
+ lib/linux-x86_64/libdiozero-system-utils.so; osname=Linux; processor=x86_64,\
+ lib/macosx-x86_64/libdiozero-system-utils.dylib; osname=MacOSX; processor=x86_64
+ -jpms-module-info:
+
+ ]]></bnd></configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-jar-plugin</artifactId>
  <configuration>
  <archive>
- <addMavenDescriptor>true</addMavenDescriptor>
- <manifestEntries>
- <Automatic-Module-Name>diozero.core</Automatic-Module-Name>
- </manifestEntries>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+<!-- <addMavenDescriptor>true</addMavenDescriptor> -->
+<!-- <manifestEntries> -->
+<!-- <Automatic-Module-Name>diozero.core</Automatic-Module-Name> -->
+<!-- </manifestEntries> -->
+<!-- <manifest> -->
+<!-- <addDefaultImplementationEntries>true</addDefaultImplementationEntries> -->
+<!-- </manifest> -->
  </archive>
  </configuration>
  </plugin>
  </plugins>
  </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>8.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>5.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
 
  <reporting>
  <plugins>

diff --git a/diozero-core/src/main/java/com/diozero/animation/easing/package-info.java b/diozero-core/src/main/java/com/diozero/animation/easing/package-info.java
@@ -0,0 +1,4 @@
+
+@org.osgi.annotation.bundle.Export
+package com.diozero.animation;
+
diff --git a/diozero-core/src/main/java/com/diozero/animation/package-info.java b/diozero-core/src/main/java/com/diozero/animation/package-info.java
@@ -0,0 +1,4 @@
+
+@org.osgi.annotation.bundle.Export
+package com.diozero.animation;
+
diff --git a/diozero-core/src/main/java/com/diozero/api/function/package-info.java b/diozero-core/src/main/java/com/diozero/api/function/package-info.java
@@ -0,0 +1,4 @@
+
+@org.osgi.annotation.bundle.Export
+package com.diozero.animation;
+
diff --git a/diozero-core/src/main/java/com/diozero/api/package-info.java b/diozero-core/src/main/java/com/diozero/api/package-info.java
@@ -1,6 +1,9 @@
 /**
  * Core APIs for interfacing with devices.
  */
+@org.osgi.annotation.bundle.Export
+@aQute.bnd.annotation.licenses.MIT
+@org.osgi.annotation.bundle.Header(name = "Automatic-Module-Name",value = "diozero.core")
 package com.diozero.api;
 
 /*-

diff --git a/diozero-core/src/main/java/com/diozero/devices/mcp23xxx/package-info.java b/diozero-core/src/main/java/com/diozero/devices/mcp23xxx/package-info.java
@@ -0,0 +1,4 @@
+
+@org.osgi.annotation.bundle.Export
+package com.diozero.animation;
+
diff --git a/diozero-core/src/main/java/com/diozero/devices/motor/package-info.java b/diozero-core/src/main/java/com/diozero/devices/motor/package-info.java
@@ -0,0 +1,4 @@
+
+@org.osgi.annotation.bundle.Export
+package com.diozero.animation;
+
diff --git a/diozero-core/src/main/java/com/diozero/devices/oled/package-info.java b/diozero-core/src/main/java/com/diozero/devices/oled/package-info.java
@@ -0,0 +1,4 @@
+
+@org.osgi.annotation.bundle.Export
+package com.diozero.animation;
+
diff --git a/diozero-core/src/main/java/com/diozero/devices/package-info.java b/diozero-core/src/main/java/com/diozero/devices/package-info.java
@@ -2,6 +2,7 @@
  * Classes representing actual devices such as LEDs, Buttons as well as GPIO,
  * devices that are connected via I2C, SPI and Serial interfaces.
  */
+@org.osgi.annotation.bundle.Export
 package com.diozero.devices;
 
 /*-

diff --git a/diozero-core/src/main/java/com/diozero/devices/sandpit/package-info.java b/diozero-core/src/main/java/com/diozero/devices/sandpit/package-info.java
@@ -0,0 +1,4 @@
+
+@org.osgi.annotation.bundle.Export
+package com.diozero.animation;
+
diff --git a/...core/src/main/java/com/diozero/internal/board/allwinner/AllwinnerH5BoardInfoProvider.java b/...core/src/main/java/com/diozero/internal/board/allwinner/AllwinnerH5BoardInfoProvider.java
@@ -37,11 +37,14 @@
 import com.diozero.sbc.BoardInfo;
 import com.diozero.sbc.LocalSystemInfo;
 
+import aQute.bnd.annotation.spi.ServiceProvider;
+
 /**
  * https://linux-sunxi.org/Xunlong_Orange_Pi_Zero_Plus
  * https://linux-sunxi.org/GPIO
  * https://github.com/friendlyarm/WiringNP/blob/master/wiringPi/boardtype_friendlyelec.c#L66
  */
+@ServiceProvider(value = BoardInfoProvider.class)
 public class AllwinnerH5BoardInfoProvider implements BoardInfoProvider {
  // Not reliable
  // public static final String ORANGEPI_ZEROPLUS_HARDWARE = "sun50iw1p1";

diff --git a/...core/src/main/java/com/diozero/internal/board/allwinner/AllwinnerH6BoardInfoProvider.java b/...core/src/main/java/com/diozero/internal/board/allwinner/AllwinnerH6BoardInfoProvider.java
@@ -37,10 +37,13 @@
 import com.diozero.sbc.BoardInfo;
 import com.diozero.sbc.LocalSystemInfo;
 
+import aQute.bnd.annotation.spi.ServiceProvider;
+
 /**
  * https://linux-sunxi.org/Xunlong_Orange_Pi_One_Plus
  * https://linux-sunxi.org/GPIO
  */
+@ServiceProvider(value = BoardInfoProvider.class)
 public class AllwinnerH6BoardInfoProvider implements BoardInfoProvider {
  // Not reliable
  // public static final String ORANGEPI_ONEPLUS_HARDWARE = "sun50iw1p1";

diff --git a/...e/src/main/java/com/diozero/internal/board/allwinner/AllwinnerSun8iBoardInfoProvider.java b/...e/src/main/java/com/diozero/internal/board/allwinner/AllwinnerSun8iBoardInfoProvider.java
@@ -30,13 +30,14 @@
  * THE SOFTWARE.
  * #L%
  */
-
 import com.diozero.internal.board.GenericLinuxArmBoardInfo;
 import com.diozero.internal.spi.BoardInfoProvider;
 import com.diozero.internal.spi.MmapGpioInterface;
 import com.diozero.sbc.BoardInfo;
 import com.diozero.sbc.LocalSystemInfo;
 
+import aQute.bnd.annotation.spi.ServiceProvider;
+@ServiceProvider(value = BoardInfoProvider.class)
 public class AllwinnerSun8iBoardInfoProvider implements BoardInfoProvider {
  // E.g. CONFIG_ORANGEPI_H3, CONFIG_ORANGEPI_ZEROPLUS2_H3
  public static final String MAKE = "Allwinner sun8i";

diff --git a/...core/src/main/java/com/diozero/internal/board/beaglebone/BeagleBoneBoardInfoProvider.java b/...core/src/main/java/com/diozero/internal/board/beaglebone/BeagleBoneBoardInfoProvider.java
@@ -48,10 +48,13 @@
 import com.diozero.sbc.BoardInfo;
 import com.diozero.sbc.LocalSystemInfo;
 
+import aQute.bnd.annotation.spi.ServiceProvider;
+
 /*-
  * https://github.com/derekmolloy/boneDeviceTree/raw/master/docs/BeagleboneBlackP8HeaderTable.pdf
  * https://github.com/derekmolloy/boneDeviceTree/raw/master/docs/BeagleboneBlackP9HeaderTable.pdf
  */
+@ServiceProvider(value = BoardInfoProvider.class)
 public class BeagleBoneBoardInfoProvider implements BoardInfoProvider {
  public static final String MAKE = "BeagleBone";
 

diff --git a/diozero-core/src/main/java/com/diozero/internal/board/beaglebone/package-info.java b/diozero-core/src/main/java/com/diozero/internal/board/beaglebone/package-info.java
@@ -0,0 +1,4 @@
+
+@aQute.bnd.annotation.jpms.ExportTo({"com.diozero.provider.bbbiolib"})
+package com.diozero.internal.provider.builtin;
+
diff --git a/diozero-core/src/main/java/com/diozero/internal/board/chip/ChipBoardInfoProvider.java b/diozero-core/src/main/java/com/diozero/internal/board/chip/ChipBoardInfoProvider.java
@@ -46,6 +46,8 @@
 import com.diozero.sbc.BoardInfo;
 import com.diozero.sbc.LocalSystemInfo;
 
+import aQute.bnd.annotation.spi.ServiceProvider;
+@ServiceProvider(value = BoardInfoProvider.class)
 public class ChipBoardInfoProvider implements BoardInfoProvider {
  public static final String MAKE = "Next Thing Company";
  public static final String MODEL_CHIP = "CHIP";

diff --git a/diozero-core/src/main/java/com/diozero/internal/board/odroid/OdroidBoardInfoProvider.java b/diozero-core/src/main/java/com/diozero/internal/board/odroid/OdroidBoardInfoProvider.java
@@ -37,6 +37,8 @@
 import com.diozero.sbc.BoardInfo;
 import com.diozero.sbc.LocalSystemInfo;
 
+import aQute.bnd.annotation.spi.ServiceProvider;
+@ServiceProvider(value = BoardInfoProvider.class)
 public class OdroidBoardInfoProvider implements BoardInfoProvider {
  public static final String MAKE = "Odroid";
  public static final String C1_HARDWARE_ID = "ODROID-C1";

diff --git a/...re/src/main/java/com/diozero/internal/board/raspberrypi/RaspberryPiBoardInfoProvider.java b/...re/src/main/java/com/diozero/internal/board/raspberrypi/RaspberryPiBoardInfoProvider.java
@@ -49,12 +49,15 @@
 import com.diozero.sbc.BoardInfo;
 import com.diozero.sbc.LocalSystemInfo;
 
+import aQute.bnd.annotation.spi.ServiceProvider;
+
 /**
  * See
  * <a href="https://github.com/AndrewFromMelbourne/raspberry_pi_revision">this c
  * library</a>. See also <a href="http://elinux.org/RPi_HardwareHistory">this
  * table of revisions</a>.
  */
+@ServiceProvider(value = BoardInfoProvider.class)
 public class RaspberryPiBoardInfoProvider implements BoardInfoProvider {
  public static final String MAKE = "Raspberry Pi";
  private static final String BCM_HARDWARE_PREFIX = "BCM";

diff --git a/diozero-core/src/main/java/com/diozero/internal/board/raspberrypi/package-info.java b/diozero-core/src/main/java/com/diozero/internal/board/raspberrypi/package-info.java
@@ -0,0 +1,4 @@
+
+@aQute.bnd.annotation.jpms.ExportTo({"com.diozero.provider.pigpio"})
+package com.diozero.internal.provider.builtin;
+
diff --git a/...re/src/main/java/com/diozero/internal/board/tinkerboard/TinkerBoardBoardInfoProvider.java b/...re/src/main/java/com/diozero/internal/board/tinkerboard/TinkerBoardBoardInfoProvider.java
@@ -37,6 +37,9 @@
 import com.diozero.sbc.BoardInfo;
 import com.diozero.sbc.LocalSystemInfo;
 
+import aQute.bnd.annotation.spi.ServiceProvider;
+
+@ServiceProvider(value = BoardInfoProvider.class)
 public class TinkerBoardBoardInfoProvider implements BoardInfoProvider {
  public static final String MAKE = "Asus";
  private static final String TINKER_BOARD_HARDWARE_ID = "Rockchip (Device Tree)";

diff --git a/diozero-core/src/main/java/com/diozero/internal/provider/builtin/gpio/package-info.java b/diozero-core/src/main/java/com/diozero/internal/provider/builtin/gpio/package-info.java
@@ -0,0 +1,4 @@
+
+@aQute.bnd.annotation.jpms.ExportTo({"com.diozero.sampleapps"})
+package com.diozero.internal.provider.builtin;
+
diff --git a/diozero-core/src/main/java/com/diozero/internal/provider/builtin/i2c/package-info.java b/diozero-core/src/main/java/com/diozero/internal/provider/builtin/i2c/package-info.java
@@ -0,0 +1,4 @@
+
+@aQute.bnd.annotation.jpms.ExportTo({"com.diozero.provider.bbbiolib"})
+package com.diozero.internal.provider.builtin;
+
diff --git a/diozero-core/src/main/java/com/diozero/internal/provider/builtin/package-info.java b/diozero-core/src/main/java/com/diozero/internal/provider/builtin/package-info.java
@@ -2,6 +2,7 @@
  * The built-in default provider supporting GPIO, I2C, SPI and Serial device
  * communication.
  */
+@aQute.bnd.annotation.jpms.ExportTo({"com.diozero.provider.bbbiolib", "com.diozero.provider.mmap", "com.diozero.provider.remote"})
 package com.diozero.internal.provider.builtin;
 
 /*-

diff --git a/diozero-core/src/main/java/com/diozero/internal/provider/builtin/serial/package-info.java b/diozero-core/src/main/java/com/diozero/internal/provider/builtin/serial/package-info.java
@@ -0,0 +1,4 @@
+
+@aQute.bnd.annotation.jpms.ExportTo({"com.diozero.provider.remote"})
+package com.diozero.internal.provider.builtin;
+
diff --git a/diozero-core/src/main/java/com/diozero/internal/spi/BoardInfoProvider.java b/diozero-core/src/main/java/com/diozero/internal/spi/BoardInfoProvider.java
@@ -37,6 +37,10 @@
 import com.diozero.sbc.LocalSystemInfo;
 import com.diozero.util.ServiceLoaderUtil;
 
+import aQute.bnd.annotation.Resolution;
+import aQute.bnd.annotation.spi.ServiceConsumer;
+
+@ServiceConsumer(value = BoardInfoProvider.class,resolution = Resolution.OPTIONAL)
 public interface BoardInfoProvider {
  BoardInfo lookup(LocalSystemInfo sysInfo);
 

diff --git a/diozero-core/src/main/java/com/diozero/internal/spi/NativeDeviceFactoryInterface.java b/diozero-core/src/main/java/com/diozero/internal/spi/NativeDeviceFactoryInterface.java
@@ -37,6 +37,10 @@
 import com.diozero.sbc.BoardInfo;
 import com.diozero.util.ServiceLoaderUtil;
 
+import aQute.bnd.annotation.Resolution;
+import aQute.bnd.annotation.spi.ServiceConsumer;
+
+@ServiceConsumer(value = NativeDeviceFactoryInterface.class,resolution = Resolution.OPTIONAL)
 public interface NativeDeviceFactoryInterface extends GpioDeviceFactoryInterface, SpiDeviceFactoryInterface,
  I2CDeviceFactoryInterface, PwmOutputDeviceFactoryInterface, ServoDeviceFactoryInterface,
  AnalogInputDeviceFactoryInterface, AnalogOutputDeviceFactoryInterface, SerialDeviceFactoryInterface {

diff --git a/diozero-core/src/main/java/com/diozero/sbc/package-info.java b/diozero-core/src/main/java/com/diozero/sbc/package-info.java
@@ -1,6 +1,7 @@
 /**
  * APIs for interfacing with the host board.
  */
+@org.osgi.annotation.bundle.Export
 package com.diozero.sbc;
 
 /*-

diff --git a/diozero-core/src/main/java/com/diozero/util/package-info.java b/diozero-core/src/main/java/com/diozero/util/package-info.java
@@ -0,0 +1,4 @@
+
+@org.osgi.annotation.bundle.Export
+package com.diozero.animation;
+
diff --git a/diozero-core/src/main/resources/META-INF/services/com.diozero.internal.spi.BoardInfoProvider b/diozero-core/src/main/resources/META-INF/services/com.diozero.internal.spi.BoardInfoProvider