I think i got dis grpc finally figured out part: after this give up

gitlab #98

Change-Id: I20b574bbb25ce143645b469d7944a282bffbc7f5

diff --git a/releng/io.grpc/pom.xml b/releng/io.grpc/pom.xml
index dd672e592d60fc6b136f7269d2af4508c4dd9892..0de8ea7c6d3699a937d66f9c9e3769a0cfd8f0aa 100644 (file)
--- a/releng/io.grpc/pom.xml
+++ b/releng/io.grpc/pom.xml
@@ -3,7 +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>
+        <grpc.version.actual>1.14.0.b006</grpc.version.actual>
     </properties>
 
     <groupId>io.grpc</groupId>
@@ -50,6 +50,7 @@
                                 filter:="(osgi.serviceloader=io.grpc.ManagedChannelProvider)";
                                 cardinality:=multiple
                         </Require-Capability>
+                        <Require-Bundle>com.google.guava</Require-Bundle>
                         <Import-Package>*;resolution:=optional</Import-Package>
                         <Bundle-Version>${grpc.version.actual}</Bundle-Version>
                     </instructions>

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 694a169910d9a5048e2a89661ee75766f886c1f3..83e0e802d372d591be7ca381d2e4d0c5a6870250 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.b005</grpc.version.actual>
+        <grpc.version.actual>1.14.0.b006</grpc.version.actual>
         <protobuf.version>3.5.1</protobuf.version>
     </properties>
 
@@ -33,7 +33,7 @@
             <id>project-specific-deps</id>
             <name>project-specific-deps</name>
             <url>file:///${basedir}/repo</url>
-        </repository>
+        </repository>c.version.actual
         --> 
     </repositories>