From: jsimomaa <jani.simomaa@gmail.com>
Date: Tue, 4 Sep 2018 07:20:52 +0000 (+0300)
Subject: Try to fix grpc work with OSGI via ARIES serviceloader
X-Git-Tag: v1.43.0~136^2~387^2~12
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=732dc01ffeeee74403ca3667ab43a08169689fa4

Try to fix grpc work with OSGI via ARIES serviceloader

gitlab #98

Change-Id: Id534a1da66c9593d4b514166ec916de069c717de
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 7f1d8d59d..7f27b3e96 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -482,6 +482,8 @@
                                             io.grpc.util;version="${grpc.version}"
                                         </Export-Package>
                                         <Import-Package>!com.google.errorprone.annotations,*</Import-Package>
+                                        <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=io.grpc.ServerProvider,io.grpc.ManagedChannelProvider)"; cardinality:=multiple</Require-Capability>
+                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -504,6 +506,12 @@
                                 <artifact>
                                     <id>io.grpc:grpc-netty:${grpc.version}</id>
                                     <source>true</source>
+                                    <override>true</override>
+                                    <instructions>
+                                        <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
+                                        <Provide-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=io.grpc.ServerProvider,io.grpc.ManagedChannelProvider)"</Provide-Capability>
+                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
+                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>com.google.protobuf:protobuf-java:${protobuf.version}</id>