Still try to fix grpc work with OSGI via ARIES serviceloader

[simantics/platform.git] / releng / org.simantics.sdk.build.p2.site / pom.xml

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 7f27b3e96ea16b39abb24936a9f116dab93b9217..63cb8205145869092ae4364787a4d0d9207b1836 100644 (file)
--- 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.b003</grpc.version.actual>
         <protobuf.version>3.5.1</protobuf.version>
     </properties>
 
@@ -433,7 +433,8 @@
                                     <source>true</source>
                                 </artifact>
                                  <artifact>
-                                     <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.8</id>
+                                     <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.14</id>
+                                     <source>true</source>
                                  </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.core:jersey-server:${jersey.version}</id>
@@ -482,7 +483,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 +518,29 @@
                                     <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-Bundle>
+                                             io.netty.buffer;bundle-version="4.1.27",
+                                             io.netty.codec;bundle-version="4.1.27",
+                                             io.netty.codec-http;bundle-version="4.1.27",
+                                             io.netty.codec-http2;bundle-version="4.1.27",
+                                             io.netty.codec-socks;bundle-version="4.1.27",
+                                             io.netty.common;bundle-version="4.1.27",
+                                             io.netty.handler;bundle-version="4.1.27",
+                                             io.netty.handler-proxy;bundle-version="4.1.27",
+                                             io.netty.resolver;bundle-version="4.1.27",
+                                             io.netty.transport;bundle-version="4.1.27"
+                                        </Require-Bundle>
+                                        <Import-Package>!io.netty.*</Import-Package>
+                                        <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>