From 36b8539dc000840dc48296663140e93e13037463 Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 20 Jun 2019 01:21:44 +0300
Subject: [PATCH] Update to io.grcp 1.21.0 and protobuf 3.7.1

Updated sdk build target platform to match updated external
dependencies.

gitlab #308

Change-Id: Id5b5fc548d545cff25f50607ca7af4a18faecec6
---
 ...imantics.sdk.build.targetdefinition.target | 73 +++++++++----------
 ...g.simantics.sdk.build.targetdefinition.tpd | 11 +--
 2 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
index a8f5f2295..e35c97785 100644
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Eclipse Oxygen" sequenceNumber="1536142643">
+<target name="Eclipse Oxygen" sequenceNumber="1560982730">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -142,16 +142,16 @@
       <unit id="ch.qos.logback.classic.source" version="1.2.3"/>
       <unit id="ch.qos.logback.core" version="1.2.3"/>
       <unit id="ch.qos.logback.core.source" version="1.2.3"/>
-      <unit id="com.google.api.grpc.proto-google-common-protos" version="1.0.0"/>
-      <unit id="com.google.api.grpc.proto-google-common-protos.source" version="1.0.0"/>
-      <unit id="com.google.code.findbugs.jsr305" version="3.0.0"/>
-      <unit id="com.google.code.findbugs.jsr305.source" version="3.0.0"/>
-      <unit id="com.google.errorprone.error_prone_annotations" version="2.1.2"/>
-      <unit id="com.google.errorprone.error_prone_annotations.source" version="2.1.2"/>
+      <unit id="com.google.android.annotations" version="4.1.1.4"/>
+      <unit id="com.google.android.annotations.source" version="4.1.1.4"/>
+      <unit id="com.google.api.grpc.proto-google-common-protos" version="1.12.0"/>
+      <unit id="com.google.api.grpc.proto-google-common-protos.source" version="1.12.0"/>
+      <unit id="com.google.errorprone.error_prone_annotations" version="2.3.2"/>
+      <unit id="com.google.errorprone.error_prone_annotations.source" version="2.3.2"/>
       <unit id="com.google.gson" version="2.7.0"/>
       <unit id="com.google.gson.source" version="2.7.0"/>
-      <unit id="com.google.protobuf" version="3.5.1"/>
-      <unit id="com.google.protobuf.source" version="3.5.1"/>
+      <unit id="com.google.protobuf" version="3.7.1"/>
+      <unit id="com.google.protobuf.source" version="3.7.1"/>
       <unit id="com.esotericsoftware.kryo" version="4.0.0"/>
       <unit id="com.esotericsoftware.kryo.source" version="4.0.0"/>
       <unit id="com.esotericsoftware.minlog" version="1.3.0"/>
@@ -178,8 +178,6 @@
       <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.8"/>
       <unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
       <unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
-      <unit id="com.github.virtuald.curvesapi" version="1.4.0"/>
-      <unit id="com.github.virtuald.curvesapi.source" version="1.4.0"/>
       <unit id="com.healthmarketscience.jackcess" version="2.1.3"/>
       <unit id="com.healthmarketscience.jackcess.source" version="2.1.3"/>
       <unit id="com.koloboke.api-jdk8" version="1.0.0"/>
@@ -198,33 +196,30 @@
       <unit id="freemarker.source" version="2.3.23.stable"/>
       <unit id="gnu.trove3" version="3.0.3"/>
       <unit id="gnu.trove3.source" version="3.0.3"/>
-      <unit id="io.grpc" version="1.14.0.b007"/>
-      <unit id="io.grpc.netty" version="1.14.0.b007"/>
-      <unit id="io.grpc.netty.source" version="1.14.0.b007"/>
-      <unit id="io.netty.buffer" version="4.1.27.Final"/>
-      <unit id="io.netty.buffer.source" version="4.1.27.Final"/>
-      <unit id="io.netty.codec" version="4.1.27.Final"/>
-      <unit id="io.netty.codec.source" version="4.1.27.Final"/>
-      <unit id="io.netty.codec-http" version="4.1.27.Final"/>
-      <unit id="io.netty.codec-http.source" version="4.1.27.Final"/>
-      <unit id="io.netty.codec-http2" version="4.1.27.Final"/>
-      <unit id="io.netty.codec-http2.source" version="4.1.27.Final"/>
-      <unit id="io.netty.codec-socks" version="4.1.27.Final"/>
-      <unit id="io.netty.codec-socks.source" version="4.1.27.Final"/>
-      <unit id="io.netty.common" version="4.1.27.Final"/>
-      <unit id="io.netty.common.source" version="4.1.27.Final"/>
-      <unit id="io.netty.handler" version="4.1.27.Final"/>
-      <unit id="io.netty.handler.source" version="4.1.27.Final"/>
-      <unit id="io.netty.handler-proxy" version="4.1.27.Final"/>
-      <unit id="io.netty.handler-proxy.source" version="4.1.27.Final"/>
-      <unit id="io.netty.resolver" version="4.1.27.Final"/>
-      <unit id="io.netty.resolver.source" version="4.1.27.Final"/>
-      <unit id="io.netty.transport" version="4.1.27.Final"/>
-      <unit id="io.netty.transport.source" version="4.1.27.Final"/>
-      <unit id="io.opencensus.api" version="0.12.3"/>
-      <unit id="io.opencensus.api.source" version="0.12.3"/>
-      <unit id="io.opencensus.contrib-grpc-metrics" version="0.12.3"/>
-      <unit id="io.opencensus.contrib-grpc-metrics.source" version="0.12.3"/>
+      <unit id="io.netty.buffer" version="4.1.35.Final"/>
+      <unit id="io.netty.buffer.source" version="4.1.35.Final"/>
+      <unit id="io.netty.codec" version="4.1.35.Final"/>
+      <unit id="io.netty.codec.source" version="4.1.35.Final"/>
+      <unit id="io.netty.codec-http" version="4.1.35.Final"/>
+      <unit id="io.netty.codec-http.source" version="4.1.35.Final"/>
+      <unit id="io.netty.codec-http2" version="4.1.35.Final"/>
+      <unit id="io.netty.codec-http2.source" version="4.1.35.Final"/>
+      <unit id="io.netty.codec-socks" version="4.1.35.Final"/>
+      <unit id="io.netty.codec-socks.source" version="4.1.35.Final"/>
+      <unit id="io.netty.common" version="4.1.35.Final"/>
+      <unit id="io.netty.common.source" version="4.1.35.Final"/>
+      <unit id="io.netty.handler" version="4.1.35.Final"/>
+      <unit id="io.netty.handler.source" version="4.1.35.Final"/>
+      <unit id="io.netty.handler-proxy" version="4.1.35.Final"/>
+      <unit id="io.netty.handler-proxy.source" version="4.1.35.Final"/>
+      <unit id="io.netty.resolver" version="4.1.35.Final"/>
+      <unit id="io.netty.resolver.source" version="4.1.35.Final"/>
+      <unit id="io.netty.transport" version="4.1.35.Final"/>
+      <unit id="io.netty.transport.source" version="4.1.35.Final"/>
+      <unit id="io.opencensus.api" version="0.21.0"/>
+      <unit id="io.opencensus.api.source" version="0.21.0"/>
+      <unit id="io.opencensus.contrib-grpc-metrics" version="0.21.0"/>
+      <unit id="io.opencensus.contrib-grpc-metrics.source" version="0.21.0"/>
       <unit id="it.unimi.dsi.fastutil" version="7.2.1"/>
       <unit id="it.unimi.dsi.fastutil.source" version="7.2.1"/>
       <unit id="jakarta-regexp" version="1.4.0"/>
@@ -280,7 +275,6 @@
       <unit id="org.apache.pdfbox.source" version="2.0.3"/>
       <unit id="org.apache.pdfbox.xmpbox" version="2.0.3"/>
       <unit id="org.apache.pdfbox.xmpbox.source" version="2.0.3"/>
-      <unit id="org.apache.xmlbeans" version="2.6.0"/>
       <unit id="org.bouncycastle.bcmail-jdk14" version="1.38.0"/>
       <unit id="org.bouncycastle.bcmail-jdk14.source" version="1.38.0"/>
       <unit id="org.bouncycastle.bcprov-jdk14" version="1.38.0"/>
@@ -370,6 +364,7 @@
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.batik" version="1.8.0.201611220734"/>
       <unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>
+      <unit id="io.grpc.feature.feature.group" version="1.21.0.201906191442"/>
       <repository location="http://www.simantics.org/download/master/external-components/manual"/>
     </location>
   </locations>
diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
index abbf6cf50..87e603a78 100644
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
@@ -141,10 +141,10 @@ location "http://www.simantics.org/download/master/external-components/maven" {
 	ch.qos.logback.classic.source
 	ch.qos.logback.core
 	ch.qos.logback.core.source
+	com.google.android.annotations
+	com.google.android.annotations.source
 	com.google.api.grpc.proto-google-common-protos
 	com.google.api.grpc.proto-google-common-protos.source
-	com.google.code.findbugs.jsr305
-	com.google.code.findbugs.jsr305.source
 	com.google.errorprone.error_prone_annotations
 	com.google.errorprone.error_prone_annotations.source
 	com.google.gson
@@ -177,8 +177,6 @@ location "http://www.simantics.org/download/master/external-components/maven" {
 	com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source
 	com.fasterxml.woodstox.woodstox-core
 	com.fasterxml.woodstox.woodstox-core.source
-	com.github.virtuald.curvesapi
-	com.github.virtuald.curvesapi.source
 	com.healthmarketscience.jackcess
 	com.healthmarketscience.jackcess.source
 	com.koloboke.api-jdk8
@@ -197,9 +195,6 @@ location "http://www.simantics.org/download/master/external-components/maven" {
 	freemarker.source
 	gnu.trove3
 	gnu.trove3.source
-	io.grpc
-	io.grpc.netty
-	io.grpc.netty.source
 	io.netty.buffer
 	io.netty.buffer.source
 	io.netty.codec
@@ -279,7 +274,6 @@ location "http://www.simantics.org/download/master/external-components/maven" {
 	org.apache.pdfbox.source
 	org.apache.pdfbox.xmpbox
 	org.apache.pdfbox.xmpbox.source
-	org.apache.xmlbeans
 	org.bouncycastle.bcmail-jdk14
 	org.bouncycastle.bcmail-jdk14.source
 	org.bouncycastle.bcprov-jdk14
@@ -369,4 +363,5 @@ location "http://www.simantics.org/download/master/external-components/maven" {
 location "http://www.simantics.org/download/master/external-components/manual" {
 	org.apache.batik
 	org.apache.poi.feature.feature.group
+	io.grpc.feature.feature.group
 }
-- 
2.43.2