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

Still try to fix grpc work with OSGI via ARIES serviceloader

gitlab #98

Change-Id: Ia8dbdcf48aaa9c9c31c9f0c44d9340dc41fad3e5
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index c27b59573..63cb82051 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.b002</grpc.version.actual>
+        <grpc.version.actual>1.14.0.b003</grpc.version.actual>
         <protobuf.version>3.5.1</protobuf.version>
     </properties>
 
@@ -518,6 +518,19 @@
                                     <source>true</source>
                                     <override>true</override>
                                     <instructions>
+                                        <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)"