From d5c224cf541cc132d9f9a378e69e76dd5b94dc82 Mon Sep 17 00:00:00 2001
From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Tue, 18 Jun 2019 13:22:00 +0300
Subject: [PATCH] Update to io.grcp 1.21.0 and protobuf 3.7.1

gitlab #308

Change-Id: I106491d49c449045e990f2e01d814479fda83820
---
 .../org.simantics.sdk.build.p2.site/pom.xml   | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 82a5d94d5..4e4e140b6 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -21,9 +21,9 @@
         <jersey.version>2.25.1</jersey.version>
         <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.b007</grpc.version.actual>
-        <protobuf.version>3.5.1</protobuf.version>
+        <grpc.version>1.21.0</grpc.version>
+        <grpc.version.actual>1.21.0</grpc.version.actual>
+        <protobuf.version>3.7.1</protobuf.version>
     </properties>
 
 
@@ -466,27 +466,40 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>io.grpc:io.grpc:${grpc.version}</id>
+                                    <id>io.grpc:grpc-core:${grpc.version}</id>
+                                    <source>true</source>
+                                </artifact>
+								<artifact>
+                                    <id>io.grpc:grpc-protobuf:${grpc.version}</id>
+                                    <source>true</source>
+                                </artifact>
+								<artifact>
+                                    <id>io.grpc:grpc-stub:${grpc.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>io.grpc:grpc-netty:${grpc.version}</id>
+                                    <id>io.grpc:grpc-netty-shaded:${grpc.version}</id>
                                     <source>true</source>
-                                    <override>true</override>
+									<override>true</override>
                                     <instructions>
+									    <!--
                                         <Require-Bundle>
-                                             io.netty.buffer;bundle-version="4.1.27",
-                                             io.netty.codec;bundle-version="4.1.27",
-                                             io.netty.codec-http;bundle-version="4.1.27",
-                                             io.netty.codec-http2;bundle-version="4.1.27",
-                                             io.netty.codec-socks;bundle-version="4.1.27",
-                                             io.netty.common;bundle-version="4.1.27",
-                                             io.netty.handler;bundle-version="4.1.27",
-                                             io.netty.handler-proxy;bundle-version="4.1.27",
-                                             io.netty.resolver;bundle-version="4.1.27",
-                                             io.netty.transport;bundle-version="4.1.27",
+                                             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>
+										   grpc.core
+										</Require-Bundle>
                                         <Import-Package>!io.netty.*,*;resolution:=optional</Import-Package>
                                         <Require-Capability>
                                             osgi.extender;
@@ -501,6 +514,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>
                                     <source>true</source>
@@ -509,6 +523,7 @@
                                         <Import-Package>!sun.misc.*,*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
+								-->
                             </artifacts>
                         </configuration>
                     </execution>
-- 
2.47.1