From: Marko Luukkainen Date: Wed, 19 Jun 2019 07:42:45 +0000 (+0300) Subject: Update to io.grcp 1.21.0 and protobuf 3.7.1 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=d4c5934730ac9a99d28d790ce74582213cac73ce;p=simantics%2Fthird-party.git Update to io.grcp 1.21.0 and protobuf 3.7.1 Manually packaged grpc jars to single plug-in gitlab #308 Change-Id: If3e1a57b50529657dc7606fa150317796f8d319c (cherry picked from commit a73cefeb118c60e8bea6ce7c7bfcc38972edf971) --- diff --git a/features/io.grpc.feature/.project b/features/io.grpc.feature/.project new file mode 100644 index 0000000..c2f502e --- /dev/null +++ b/features/io.grpc.feature/.project @@ -0,0 +1,17 @@ + + + io.grpc.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/features/io.grpc.feature/build.properties b/features/io.grpc.feature/build.properties new file mode 100644 index 0000000..64f93a9 --- /dev/null +++ b/features/io.grpc.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/features/io.grpc.feature/feature.xml b/features/io.grpc.feature/feature.xml new file mode 100644 index 0000000..6223c03 --- /dev/null +++ b/features/io.grpc.feature/feature.xml @@ -0,0 +1,75 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + + diff --git a/features/io.grpc/.classpath b/features/io.grpc/.classpath new file mode 100644 index 0000000..df9b884 --- /dev/null +++ b/features/io.grpc/.classpath @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/features/io.grpc/.project b/features/io.grpc/.project new file mode 100644 index 0000000..b338723 --- /dev/null +++ b/features/io.grpc/.project @@ -0,0 +1,28 @@ + + + io.grpc + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/features/io.grpc/.settings/org.eclipse.jdt.core.prefs b/features/io.grpc/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..0c68a61 --- /dev/null +++ b/features/io.grpc/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/features/io.grpc/META-INF/MANIFEST.MF b/features/io.grpc/META-INF/MANIFEST.MF new file mode 100644 index 0000000..158717c --- /dev/null +++ b/features/io.grpc/META-INF/MANIFEST.MF @@ -0,0 +1,87 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: io.grpc +Bundle-SymbolicName: io.grpc +Bundle-Version: 1.21.0.qualifier +Automatic-Module-Name: io.grpc +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-ClassPath: lib/grpc-context-1.21.0.jar, + lib/grpc-core-1.21.0.jar, + lib/grpc-netty-shaded-1.21.0.jar, + lib/grpc-protobuf-1.21.0.jar, + lib/grpc-protobuf-lite-1.21.0.jar, + lib/grpc-stub-1.21.0.jar, + ., + lib/grpc-api-1.21.0.jar +Export-Package: io.grpc, + io.grpc.inprocess, + io.grpc.internal, + io.grpc.netty.shaded.io.grpc.netty, + io.grpc.netty.shaded.io.netty.bootstrap, + io.grpc.netty.shaded.io.netty.buffer, + io.grpc.netty.shaded.io.netty.channel, + io.grpc.netty.shaded.io.netty.channel.embedded, + io.grpc.netty.shaded.io.netty.channel.epoll, + io.grpc.netty.shaded.io.netty.channel.group, + io.grpc.netty.shaded.io.netty.channel.internal, + io.grpc.netty.shaded.io.netty.channel.local, + io.grpc.netty.shaded.io.netty.channel.nio, + io.grpc.netty.shaded.io.netty.channel.oio, + io.grpc.netty.shaded.io.netty.channel.pool, + io.grpc.netty.shaded.io.netty.channel.socket, + io.grpc.netty.shaded.io.netty.channel.socket.nio, + io.grpc.netty.shaded.io.netty.channel.socket.oio, + io.grpc.netty.shaded.io.netty.channel.unix, + io.grpc.netty.shaded.io.netty.handler.codec, + io.grpc.netty.shaded.io.netty.handler.codec.base64, + io.grpc.netty.shaded.io.netty.handler.codec.bytes, + io.grpc.netty.shaded.io.netty.handler.codec.compression, + io.grpc.netty.shaded.io.netty.handler.codec.http, + io.grpc.netty.shaded.io.netty.handler.codec.http.cookie, + io.grpc.netty.shaded.io.netty.handler.codec.http.cors, + io.grpc.netty.shaded.io.netty.handler.codec.http.multipart, + io.grpc.netty.shaded.io.netty.handler.codec.http.websocketx, + io.grpc.netty.shaded.io.netty.handler.codec.http.websocketx.extensions, + io.grpc.netty.shaded.io.netty.handler.codec.http.websocketx.extensions.compression, + io.grpc.netty.shaded.io.netty.handler.codec.http2, + io.grpc.netty.shaded.io.netty.handler.codec.json, + io.grpc.netty.shaded.io.netty.handler.codec.marshalling, + io.grpc.netty.shaded.io.netty.handler.codec.protobuf, + io.grpc.netty.shaded.io.netty.handler.codec.rtsp, + io.grpc.netty.shaded.io.netty.handler.codec.serialization, + io.grpc.netty.shaded.io.netty.handler.codec.socks, + io.grpc.netty.shaded.io.netty.handler.codec.socksx, + io.grpc.netty.shaded.io.netty.handler.codec.socksx.v4, + io.grpc.netty.shaded.io.netty.handler.codec.socksx.v5, + io.grpc.netty.shaded.io.netty.handler.codec.spdy, + io.grpc.netty.shaded.io.netty.handler.codec.string, + io.grpc.netty.shaded.io.netty.handler.codec.xml, + io.grpc.netty.shaded.io.netty.handler.flow, + io.grpc.netty.shaded.io.netty.handler.flush, + io.grpc.netty.shaded.io.netty.handler.ipfilter, + io.grpc.netty.shaded.io.netty.handler.logging, + io.grpc.netty.shaded.io.netty.handler.proxy, + io.grpc.netty.shaded.io.netty.handler.ssl, + io.grpc.netty.shaded.io.netty.handler.ssl.ocsp, + io.grpc.netty.shaded.io.netty.handler.ssl.util, + io.grpc.netty.shaded.io.netty.handler.stream, + io.grpc.netty.shaded.io.netty.handler.timeout, + io.grpc.netty.shaded.io.netty.handler.traffic, + io.grpc.netty.shaded.io.netty.internal.tcnative, + io.grpc.netty.shaded.io.netty.resolver, + io.grpc.netty.shaded.io.netty.util, + io.grpc.netty.shaded.io.netty.util.collection, + io.grpc.netty.shaded.io.netty.util.concurrent, + io.grpc.perfmark, + io.grpc.protobuf, + io.grpc.protobuf.lite, + io.grpc.stub, + io.grpc.stub.annotations, + io.grpc.util +Require-Bundle: com.google.api.grpc.proto-google-common-protos;bundle-version="1.12.0", + com.google.errorprone.error_prone_annotations;bundle-version="2.3.2", + com.google.gson;bundle-version="2.7.0", + com.google.guava;bundle-version="21.0.0", + com.google.protobuf;bundle-version="3.7.1", + io.opencensus.api;bundle-version="0.21.0", + io.opencensus.contrib-grpc-metrics;bundle-version="0.21.0" diff --git a/features/io.grpc/build.properties b/features/io.grpc/build.properties new file mode 100644 index 0000000..66b9fb3 --- /dev/null +++ b/features/io.grpc/build.properties @@ -0,0 +1,11 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + lib/grpc-context-1.21.0.jar,\ + lib/grpc-core-1.21.0.jar,\ + lib/grpc-netty-shaded-1.21.0.jar,\ + lib/grpc-protobuf-1.21.0.jar,\ + lib/grpc-protobuf-lite-1.21.0.jar,\ + lib/grpc-stub-1.21.0.jar,\ + lib/grpc-api-1.21.0.jar diff --git a/features/io.grpc/lib/grpc-api-1.21.0.jar b/features/io.grpc/lib/grpc-api-1.21.0.jar new file mode 100644 index 0000000..639dfdb Binary files /dev/null and b/features/io.grpc/lib/grpc-api-1.21.0.jar differ diff --git a/features/io.grpc/lib/grpc-context-1.21.0.jar b/features/io.grpc/lib/grpc-context-1.21.0.jar new file mode 100644 index 0000000..ede9fef Binary files /dev/null and b/features/io.grpc/lib/grpc-context-1.21.0.jar differ diff --git a/features/io.grpc/lib/grpc-core-1.21.0.jar b/features/io.grpc/lib/grpc-core-1.21.0.jar new file mode 100644 index 0000000..a4e1fbb Binary files /dev/null and b/features/io.grpc/lib/grpc-core-1.21.0.jar differ diff --git a/features/io.grpc/lib/grpc-netty-shaded-1.21.0.jar b/features/io.grpc/lib/grpc-netty-shaded-1.21.0.jar new file mode 100644 index 0000000..8e2908f Binary files /dev/null and b/features/io.grpc/lib/grpc-netty-shaded-1.21.0.jar differ diff --git a/features/io.grpc/lib/grpc-protobuf-1.21.0.jar b/features/io.grpc/lib/grpc-protobuf-1.21.0.jar new file mode 100644 index 0000000..2ebf7e1 Binary files /dev/null and b/features/io.grpc/lib/grpc-protobuf-1.21.0.jar differ diff --git a/features/io.grpc/lib/grpc-protobuf-lite-1.21.0.jar b/features/io.grpc/lib/grpc-protobuf-lite-1.21.0.jar new file mode 100644 index 0000000..88b168b Binary files /dev/null and b/features/io.grpc/lib/grpc-protobuf-lite-1.21.0.jar differ diff --git a/features/io.grpc/lib/grpc-stub-1.21.0.jar b/features/io.grpc/lib/grpc-stub-1.21.0.jar new file mode 100644 index 0000000..87411ee Binary files /dev/null and b/features/io.grpc/lib/grpc-stub-1.21.0.jar differ