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

Still try to fix grpc work with OSGI via ARIES serviceloader

gitlab #98

Change-Id: I7cef18eaa455fdfb90ba038783daf1b97e05f1cf
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 7f27b3e96..d8122670b 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -23,7 +23,7 @@
         <slf4j.version>1.7.25</slf4j.version>
         <slf4j.version.actual>1.7.25.b001</slf4j.version.actual>
         <grpc.version>1.14.0</grpc.version>
-        <grpc.version.actual>1.14.0.b001</grpc.version.actual>
+        <grpc.version.actual>1.14.0.b002</grpc.version.actual>
         <protobuf.version>3.5.1</protobuf.version>
     </properties>
 
@@ -482,7 +482,16 @@
                                             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>
+                                        <Require-Capability>
+                                            osgi.extender;
+                                                filter:="(osgi.extender=osgi.serviceloader.processor)",
+                                            osgi.serviceloader;
+                                                filter:="(osgi.serviceloader=io.grpc.ServerProvider)";
+                                                cardinality:=multiple,
+                                            osgi.serviceloader;
+                                                filter:="(osgi.serviceloader=io.grpc.ManagedChannelProvider)";
+                                                cardinality:=multiple
+                                        </Require-Capability>
                                         <Bundle-Version>${grpc.version.actual}</Bundle-Version>
                                     </instructions>
                                 </artifact>
@@ -508,8 +517,16 @@
                                     <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>
+                                        <Require-Capability>
+                                            osgi.extender;
+                                                filter:="(osgi.extender=osgi.serviceloader.registrar)"
+                                        </Require-Capability>
+                                        <Provide-Capability>
+                                            osgi.serviceloader;
+                                                osgi.serviceloader=io.grpc.ServerProvider,
+                                            osgi.serviceloader;
+                                                osgi.serviceloader=io.grpc.ManagedChannelProvider
+                                        </Provide-Capability>
                                         <Bundle-Version>${grpc.version.actual}</Bundle-Version>
                                     </instructions>
                                 </artifact>