From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Wed, 19 Jun 2019 11:11:35 +0000 (+0300)
Subject: Update to io.grcp 1.21.0 and protobuf 3.7.1
X-Git-Tag: v1.43.0~136^2~144
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=23e4bfe51f44aab50686fff6bc0eb3c7919b72ed;p=simantics%2Fplatform.git

Update to io.grcp 1.21.0 and protobuf 3.7.1

GRPC is available via third-party repo.

gitlab #308

Change-Id: I7b2005b46a752dc2f71061d6159d2353a8c5b770
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 822da2a75..34919d2af 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -489,6 +489,8 @@
                                     <id>org.zeroturnaround:zt-exec:${zeroturnaround.version}</id>
                                     <source>true</source>
                                 </artifact>
+								<!-- Since 1.21.0 grpc, a manually set up plugin is provided in third-party repository.
+								     Note: grpc-core, grpc-context, and grpc-stub (maybe others as well) must be bundled into same plug-in, since they contain split packages.
                                 <artifact>
                                     <id>io.grpc:io.grpc:${grpc.version}</id>
                                     <source>true</source>
@@ -532,6 +534,36 @@
                                     <instructions>
                                         <Import-Package>!sun.misc.*,*;resolution:=optional</Import-Package>
                                     </instructions>
+                                </artifact>
+								-->
+								<!-- grpc 1.21.0 dependencies -->
+								<artifact>
+                                    <id>io.opencensus:opencensus-api:0.21.0</id>
+                                    <source>true</source>
+								</artifact>
+								<artifact>
+                                    <id>com.google.code.gson:gson:2.7</id>
+                                    <source>true</source>
+								</artifact>
+								<artifact>
+                                    <id>com.google.android:annotations:4.1.1.4</id>
+                                    <source>true</source>
+								</artifact>
+								<artifact>
+                                    <id>io.opencensus:opencensus-contrib-grpc-metrics:0.21.0</id>
+                                    <source>true</source>
+								</artifact>
+								<artifact>
+                                    <id>com.google.protobuf:protobuf-java:3.7.1</id>
+                                    <source>true</source>
+                                </artifact>
+								<artifact>
+                                    <id>com.google.api.grpc:proto-google-common-protos:1.12.0</id>
+                                    <source>true</source>
+                                </artifact>
+								<artifact>
+                                    <id>com.google.errorprone:error_prone_annotations:2.3.2</id>
+                                    <source>true</source>
                                 </artifact>
                                 <artifact>
                                     <id>com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1</id>