From 53fbf9c735f873822c2ee9a11dfa1d4804769abb Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 25 Jun 2019 14:22:15 +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.

Adapted from commit 36b8539d.

gitlab #308

Change-Id: I0756f2719862806542ce612a2abfe904495e0d9c
---
 ...imantics.sdk.build.targetdefinition.target | 22 +++----------------
 ...g.simantics.sdk.build.targetdefinition.tpd | 18 +--------------
 2 files changed, 4 insertions(+), 36 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 376833f81..d53349244 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="1560856705">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Eclipse Oxygen" sequenceNumber="1561461346">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -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,20 +196,6 @@
       <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.api" version="1.21.0"/>
-      <unit id="io.grpc.api.source" version="1.21.0"/>
-      <unit id="io.grpc.context" version="1.21.0"/>
-      <unit id="io.grpc.context.source" version="1.21.0"/>
-      <unit id="io.grpc.core" version="1.21.0"/>
-      <unit id="io.grpc.core.source" version="1.21.0"/>
-      <unit id="io.grpc.netty-shaded" version="1.21.0"/>
-      <unit id="io.grpc.netty-shaded.source" version="1.21.0"/>
-      <unit id="io.grpc.protobuf-lite" version="1.21.0"/>
-      <unit id="io.grpc.protobuf-lite.source" version="1.21.0"/>
-      <unit id="io.grpc.protobuf" version="1.21.0"/>
-      <unit id="io.grpc.protobuf.source" version="1.21.0"/>
-      <unit id="io.grpc.stub" version="1.21.0"/>
-      <unit id="io.grpc.stub.source" version="1.21.0"/>
       <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"/>
@@ -271,7 +255,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"/>
@@ -353,6 +336,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/release/1.34.1/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 b462d6aa2..c5a1ec3c3 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
@@ -177,8 +177,6 @@ location "http://www.simantics.org/download/release/1.34.1/external-components/m
 	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,20 +195,6 @@ location "http://www.simantics.org/download/release/1.34.1/external-components/m
 	freemarker.source
 	gnu.trove3
 	gnu.trove3.source
-	io.grpc.api
-	io.grpc.api.source
-	io.grpc.context
-	io.grpc.context.source
-	io.grpc.core
-	io.grpc.core.source
-	io.grpc.netty-shaded
-	io.grpc.netty-shaded.source
-	io.grpc.protobuf-lite
-	io.grpc.protobuf-lite.source
-	io.grpc.protobuf
-	io.grpc.protobuf.source
-	io.grpc.stub
-	io.grpc.stub.source
 	io.opencensus.api
 	io.opencensus.api.source
 	io.opencensus.contrib-grpc-metrics
@@ -270,7 +254,6 @@ location "http://www.simantics.org/download/release/1.34.1/external-components/m
 	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
@@ -352,4 +335,5 @@ location "http://www.simantics.org/download/release/1.34.1/external-components/m
 location "http://www.simantics.org/download/release/1.34.1/external-components/manual" {
 	org.apache.batik
 	org.apache.poi.feature.feature.group
+	io.grpc.feature.feature.group
 }
-- 
2.47.1