Updated target platform for io.grpc 1.21.0 / protobuf 3.7.1

Change-Id: I61f3d2f9be003c5f540d3c3b363fb9715ce8ec20

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 bc59c740f2ead18cdbf393f76f0d2fd1715e5916..376833f81cff9f2f2a9102add1a0ffe121ba4d17 100644 (file)
--- 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="1536233018">
+<target name="Eclipse Oxygen" sequenceNumber="1560856705">
   <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.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.j2objc.annotations" version="1.1.0"/>
+      <unit id="com.google.j2objc.annotations.source" version="1.1.0"/>
+      <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"/>
@@ -198,33 +198,24 @@
       <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.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"/>
+      <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"/>

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 6975fb80f86828fccad7ff4baebf6950ac048dec..b462d6aa22e7361bab552ec276000f43c2a8af27 100644 (file)
--- 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
@@ -143,12 +143,12 @@ location "http://www.simantics.org/download/release/1.34.1/external-components/m
        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.j2objc.annotations
+       com.google.j2objc.annotations.source
        com.google.protobuf
        com.google.protobuf.source
        com.esotericsoftware.kryo
@@ -197,29 +197,20 @@ 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.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