[marytts] Add bnd to make serviceloader aware of marytts impl

[holgerfriedrich]

This is required to for the Java serviceloader to work in OSGI environment. Allows for properly reloading the binding without issues.

Fixes #14056.

Signed-off-by: Holger Friedrich mail@holger-friedrich.de

[lolodomo]

I am not enough expert in that stuff to review and merge that change but I already ask the question if this is something to include in the future 3.4 patch ?

[holgerfriedrich]

From my perspective: should be included, as users experience it during install of the add-on via UI.

But still we need someone with deeper knowledge in OSGI to check if this is the correct way to do it.

[holgerfriedrich]

@wborn The PR no longer adds the file bnd.bnd; I added the configuration for Bnd to pom.xml. Starting with the defaults from

openhab-addons/pom.xml

Line 143 in 23cfec7

<bnd><![CDATA[Bundle-SymbolicName: ${project.artifactId}

, and adding

Require-Capability:
    osgi.extender:=
      filter:="(osgi.extender=osgi.serviceloader.processor)",
    osgi.serviceloader:=
      filter:="(osgi.serviceloader=marytts.config.MaryConfig)";
      cardinality:=multiple
SPI-Provider: marytts.config.MaryConfig
SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class[marytts.config.MaryConfig])

it seems to work.

We have some duplication of code now. I did not manage to configure any of the mvn plugins to do it right.
The solution above is at least closer to how we build other bindings.

Bnd SPI annotation works fine for my PR for KNX to create the metadata file for the service loader.

[holgerfriedrich]

@wborn I introduced a variable for Bnd defaults in main pom.xml. This can be used for all plugins which need to extend the Bnd configuration, e.g. for SPI. Hope it does not break anything else.

[holgerfriedrich]

Comment above still valid, my suggestion would be to merge it the way it is implemented now.

Any other suggestions for improvement?

[wborn]

I'll have a look if it is possible to reduce the amount of bnd instruction duplication.

[holgerfriedrich]

@wborn this issue is still open, may I ask you to look into it again? Maybe we should go with the suggested approach, as currently MaryTTS (since 3.4) and KNX binding (for the coming 4.0M1) are affected by the SPI issue.
There is no duplicate code in the pom files anymore as a variable was introduced in the main pom file. Bnd instructions will be a bit more for the two affected bindings. Including the SPI capabilities could also be put into a macro, but I'm not sure if this helps as we need it only in two bindings....

If you see a better way using annotations which does not need additional Bnd configuration in pom, this of course would be better.

[wborn]

I remember seeing some duplication. But it seems gone now. 🙂 Let's give it a test. 🚀

[holgerfriedrich]

Thanks, @wborn! We will see....