From: jsimomaa Date: Mon, 3 Sep 2018 06:14:20 +0000 (+0300) Subject: Add io.grpc to target platform (master) X-Git-Tag: v1.43.0~136^2~388 X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=da5931714d4afbc1bdbf0e213df4fa73634b8155 Add io.grpc to target platform (master) gitlab #98 Change-Id: Ic003cf62b3933de2b530ec9ebd5947e93e5ac853 Add io.grpc to target platform (master) Change-Id: I6a163a3f3e3281ca8eb0bae7f01feb17bb445685 Make import com.sun optional in protobuf (for io.grpc) Change-Id: I38fd280bc04d67511f89bc200b66d9946cb8f9de Make io.grpc.context as fragment bundle to fix duplicate package name Change-Id: Icd8ac3b4cda5d046a84e859e0c84fa036eb08f83 Make io.grpc.context as fragment bundle to fix duplicate package name Change-Id: Ia90030494ac42aac193d5a852464823224540dcf io.grpc.context version bump b001 Change-Id: Ib809fb444ffe075ecfed4da597b13936857593a3 Try to fix grpc work with OSGI via ARIES serviceloader Change-Id: Id534a1da66c9593d4b514166ec916de069c717de Try to fix grpc work with OSGI via ARIES serviceloader Change-Id: I60a1f7d97ee1bcf745a47c8625bbaf373ee008c3 Still try to fix grpc work with OSGI via ARIES serviceloader Change-Id: I7cef18eaa455fdfb90ba038783daf1b97e05f1cf Still try to fix grpc work with OSGI via ARIES serviceloader Change-Id: I9c9ca3ef96d2220362ad180201b893a3fb937d56 Still try to fix grpc work with OSGI via ARIES serviceloader Change-Id: Ia8dbdcf48aaa9c9c31c9f0c44d9340dc41fad3e5 Still try to fix grpc to work with OSGI via ARIES serviceloader Change-Id: I7c1230a7adf790233fb4e4ed59156e389cecab9d Still try to fix grpc to work with OSGI via ARIES serviceloader Change-Id: Idc7fdadec0214840787b9f7655a617f9222403e0 Starting to run out of options with this one... Change-Id: I4815b0fee534baa14feb46c67f8332eaac53ebf8 Starting to run out of options with this one... Change-Id: Id4a28c7d8565d163754624fc955be10895715aad I think i got dis grpc finally figured out Change-Id: Id4eaab14733253a685a8a33c51b2abcfe361ade7 I think i got dis grpc finally figured out part 2 Change-Id: I54e86963d4faacc4d3750530d558f2b64b640691 I think i got dis grpc finally figured out part: after this give up Change-Id: I20b574bbb25ce143645b469d7944a282bffbc7f5 I think i got dis grpc finally figured out part: after this give up Change-Id: If77df59d67623725210e9d4e74ed235c63d92905 --- diff --git a/releng/io.grpc/.classpath b/releng/io.grpc/.classpath new file mode 100644 index 000000000..4ed627d28 --- /dev/null +++ b/releng/io.grpc/.classpath @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/io.grpc/.gitignore b/releng/io.grpc/.gitignore new file mode 100644 index 000000000..f0c3ef8ba --- /dev/null +++ b/releng/io.grpc/.gitignore @@ -0,0 +1,4 @@ +.settings +target +/target/ +/.settings/ \ No newline at end of file diff --git a/releng/io.grpc/.project b/releng/io.grpc/.project new file mode 100644 index 000000000..a3f1cbe36 --- /dev/null +++ b/releng/io.grpc/.project @@ -0,0 +1,24 @@ + + + io.grpc + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/releng/io.grpc/pom.xml b/releng/io.grpc/pom.xml new file mode 100644 index 000000000..9dc3f9bdc --- /dev/null +++ b/releng/io.grpc/pom.xml @@ -0,0 +1,84 @@ + + 4.0.0 + + 1.14.0 + 1.14.0.b007 + + + io.grpc + io.grpc + 1.14.0 + bundle + + + + io.grpc + grpc-core + ${grpc.version} + runtime + + + io.grpc + grpc-context + ${grpc.version} + runtime + + + io.grpc + grpc-stub + ${grpc.version} + runtime + + + io.grpc + grpc-protobuf + ${grpc.version} + runtime + + + io.grpc + grpc-protobuf-lite + ${grpc.version} + runtime + + + + + + + org.apache.felix + maven-bundle-plugin + 3.5.1 + true + + + io.grpc + ${grpc.version} + * + *;scope=compile|runtime + target/dependency + + osgi.extender; + filter:="(osgi.extender=osgi.serviceloader.processor)", + osgi.serviceloader; + filter:="(osgi.serviceloader=io.grpc.ServerProvider)"; + cardinality:=multiple, + osgi.serviceloader; + filter:="(osgi.serviceloader=io.grpc.ManagedChannelProvider)"; + cardinality:=multiple + + + com.google.guava, + com.google.protobuf, + com.google.api.grpc.proto-google-common-protos + + *;resolution:=optional + ${grpc.version.actual} + + + + + + + \ No newline at end of file diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml index db4e9b9e3..87df82cfe 100644 --- a/releng/org.simantics.sdk.build.p2.site/pom.xml +++ b/releng/org.simantics.sdk.build.p2.site/pom.xml @@ -22,16 +22,18 @@ 2.25.1 1.7.25 1.7.25.b001 + 1.14.0 + 1.14.0.b007 + 3.5.1 - @@ -430,7 +432,8 @@ true - org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.8 + org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.14 + true org.glassfish.jersey.core:jersey-server:${jersey.version} @@ -467,6 +470,50 @@ org.eclipse.jetty:jetty-servlets:9.4.5.v20170502 true + + io.grpc:io.grpc:${grpc.version} + true + + + io.grpc:grpc-netty:${grpc.version} + true + true + + + io.netty.buffer;bundle-version="4.1.27", + io.netty.codec;bundle-version="4.1.27", + io.netty.codec-http;bundle-version="4.1.27", + io.netty.codec-http2;bundle-version="4.1.27", + io.netty.codec-socks;bundle-version="4.1.27", + io.netty.common;bundle-version="4.1.27", + io.netty.handler;bundle-version="4.1.27", + io.netty.handler-proxy;bundle-version="4.1.27", + io.netty.resolver;bundle-version="4.1.27", + io.netty.transport;bundle-version="4.1.27", + io.grpc + + !io.netty.*,*;resolution:=optional + + osgi.extender; + filter:="(osgi.extender=osgi.serviceloader.registrar)" + + + osgi.serviceloader; + osgi.serviceloader=io.grpc.ServerProvider, + osgi.serviceloader; + osgi.serviceloader=io.grpc.ManagedChannelProvider + + ${grpc.version.actual} + + + + com.google.protobuf:protobuf-java:${protobuf.version} + true + true + + !sun.misc.*,*;resolution:=optional + + 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 248c48b19..8b97dffd8 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,331 +1,377 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0c68e603a..f9563a3fc 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/master/external-components/maven" { 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,42 @@ location "http://www.simantics.org/download/master/external-components/maven" { freemarker.source gnu.trove3 gnu.trove3.source + io.grpc.stub + io.grpc.stub.source + io.grpc.core + io.grpc.core.source + io.grpc.context + io.grpc.context.source + io.grpc.netty + io.grpc.netty.source + io.grpc.protobuf + io.grpc.protobuf.source + io.grpc.protobuf-lite + io.grpc.protobuf-lite.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 diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target index 8afc55ac1..eb9605a93 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target @@ -1,336 +1,382 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +