From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Wed, 19 Jun 2019 11:00:03 +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%2F56%2F2956%2F1;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: I17261abf736782a055f0d6e580052079335d09a8
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 6267ace05..11f07b95c 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -465,6 +465,8 @@
                                     <id>org.eclipse.jetty:jetty-servlets:9.4.5.v20170502</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:grpc-core:${grpc.version}</id>
                                     <source>true</source>
@@ -490,22 +492,7 @@
                                     <source>true</source>
 									<override>true</override>
                                     <instructions>
-									    <!--
-                                        <Require-Bundle>
-                                             io.netty.buffer;bundle-version="4.1.34.Final",
-                                             io.netty.codec;bundle-version="4.1.34.Final",
-                                             io.netty.codec-http;bundle-version="4.1.34.Final",
-                                             io.netty.codec-http2;bundle-version="4.1.34.Final",
-                                             io.netty.codec-socks;bundle-version="4.1.34.Final",
-                                             io.netty.common;bundle-version="4.1.34.Final",
-                                             io.netty.handler;bundle-version="4.1.34.Final",
-                                             io.netty.handler-proxy;bundle-version="4.1.34.Final",
-                                             io.netty.resolver;bundle-version="4.1.34.Final",
-                                             io.netty.transport;bundle-version="4.1.34.Final",
-                                             io.grpc
-                                        </Require-Bundle>
-										-->
-										<Require-Bundle>
+									    <Require-Bundle>
 										   io.grpc.core
 										</Require-Bundle>
                                         <Import-Package>!io.netty.*,*;resolution:=optional</Import-Package>
@@ -522,6 +509,7 @@
                                         <Bundle-Version>${grpc.version.actual}</Bundle-Version>
                                     </instructions>
                                 </artifact>
+								-->
 								<!-- This was needed with old io.grpc / protobuf
                                 <artifact>
                                     <id>com.google.protobuf:protobuf-java:${protobuf.version}</id>
@@ -532,6 +520,35 @@
                                     </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>
                             </artifacts>
                         </configuration>
                     </execution>