From 5e9b4411a2c221a14a5a2183f63242a61d5ce49e Mon Sep 17 00:00:00 2001
From: jsimomaa <jani.simomaa@gmail.com>
Date: Thu, 6 Sep 2018 14:24:23 +0300
Subject: [PATCH] Add grpc target related changes to release/1.34.1

gitlab #98

Change-Id: Id7ceaf67367f1a2baa68823bc42fc117f79671e5
---
 ...imantics.sdk.build.targetdefinition.target | 45 +++++++++++++++++--
 ...g.simantics.sdk.build.targetdefinition.tpd | 37 +++++++++++++++
 2 files changed, 78 insertions(+), 4 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 db587bca7..bc59c740f 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="1535952176">
+<target name="Eclipse Oxygen" sequenceNumber="1536233018">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -142,6 +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.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.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"/>
@@ -188,6 +198,33 @@
       <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="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"/>
@@ -205,9 +242,9 @@
       <unit id="net.ucanaccess.source" version="3.0.7"/>
       <unit id="org.antlr.runtime" version="3.5.2"/>
       <unit id="org.antlr.runtime.source" version="3.5.2"/>
-      <unit id="org.apache.aries.spifly.core-internal" version="1.0.8"/>
-      <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.0.8"/>
-      <unit id="org.apache.aries.spifly.weaver-internal" version="1.0.8"/>
+      <unit id="org.apache.aries.spifly.core-internal" version="1.0.14"/>
+      <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.0.14"/>
+      <unit id="org.apache.aries.spifly.weaver-internal" version="1.0.14"/>
       <unit id="org.apache.aries.util" version="1.0.0"/>
       <unit id="org.apache.commons.codec" version="1.10.0"/>
       <unit id="org.apache.commons.codec.source" version="1.10.0"/>
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 706a96a6b..6975fb80f 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,6 +141,16 @@ location "http://www.simantics.org/download/release/1.34.1/external-components/m
 	ch.qos.logback.classic.source
 	ch.qos.logback.core
 	ch.qos.logback.core.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
+	com.google.gson.source
+	com.google.protobuf
+	com.google.protobuf.source
 	com.esotericsoftware.kryo
 	com.esotericsoftware.kryo.source
 	com.esotericsoftware.minlog
@@ -187,6 +197,33 @@ location "http://www.simantics.org/download/release/1.34.1/external-components/m
 	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
+	io.netty.codec.source
+	io.netty.codec-http
+	io.netty.codec-http.source
+	io.netty.codec-http2
+	io.netty.codec-http2.source
+	io.netty.codec-socks
+	io.netty.codec-socks.source
+	io.netty.common
+	io.netty.common.source
+	io.netty.handler
+	io.netty.handler.source
+	io.netty.handler-proxy
+	io.netty.handler-proxy.source
+	io.netty.resolver
+	io.netty.resolver.source
+	io.netty.transport
+	io.netty.transport.source
+	io.opencensus.api
+	io.opencensus.api.source
+	io.opencensus.contrib-grpc-metrics
+	io.opencensus.contrib-grpc-metrics.source
 	it.unimi.dsi.fastutil
 	it.unimi.dsi.fastutil.source
 	jakarta-regexp
-- 
2.43.2