From: jsimomaa <jani.simomaa@gmail.com>
Date: Tue, 4 Sep 2018 13:32:31 +0000 (+0300)
Subject: I think i got dis grpc finally figured out part 2
X-Git-Tag: v1.43.0~136^2~387^2~2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=15fcaf4dc7a1447ec4aaa559db47fa421bc4e3d0

I think i got dis grpc finally figured out part 2

gitlab #98

Change-Id: I54e86963d4faacc4d3750530d558f2b64b640691
---

diff --git a/releng/io.grpc/pom.xml b/releng/io.grpc/pom.xml
index 234fe12e4..dd672e592 100644
--- a/releng/io.grpc/pom.xml
+++ b/releng/io.grpc/pom.xml
@@ -3,6 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <properties>
         <grpc.version>1.14.0</grpc.version>
+        <grpc.version.actual>1.14.0.b005</grpc.version.actual>
     </properties>
 
     <groupId>io.grpc</groupId>
@@ -49,6 +50,8 @@
                                 filter:="(osgi.serviceloader=io.grpc.ManagedChannelProvider)";
                                 cardinality:=multiple
                         </Require-Capability>
+                        <Import-Package>*;resolution:=optional</Import-Package>
+                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index cea0614ad..694a16991 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.b004</grpc.version.actual>
+        <grpc.version.actual>1.14.0.b005</grpc.version.actual>
         <protobuf.version>3.5.1</protobuf.version>
     </properties>