From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Tue, 18 Jun 2019 14:01:23 +0000 (+0300)
Subject: Update to io.grcp 1.21.0 and protobuf 3.7.1
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F2953%2F1;p=simantics%2Fplatform.git

Update to io.grcp 1.21.0 and protobuf 3.7.1

Trying a workaround for split package conflicts.

gitlab #308

Change-Id: I73625512c49eef5380752cd43e15b2708351a495
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 9d7c839ae..6267ace05 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -468,6 +468,14 @@
                                 <artifact>
                                     <id>io.grpc:grpc-core:${grpc.version}</id>
                                     <source>true</source>
+                                </artifact>
+								<artifact>
+                                    <id>io.grpc:grpc-context:${grpc.version}</id>
+                                    <source>true</source>
+									<override>true</override>
+                                    <instructions>
+									    <Fragment-Host>io.grpc.core</Fragment-Host> 
+									</instructions>
                                 </artifact>
 								<artifact>
                                     <id>io.grpc:grpc-protobuf:${grpc.version}</id>