X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=releng%2Forg.simantics.sdk.build.p2.site%2Fpom.xml;h=7f27b3e96ea16b39abb24936a9f116dab93b9217;hb=732dc01ffeeee74403ca3667ab43a08169689fa4;hp=d70e5e9073197a71a9e43cc3a97865f475a4d45b;hpb=55f100d4477a0e444ddb9e02b53edd739d208ce5;p=simantics%2Fplatform.git

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index d70e5e907..7f27b3e96 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -23,6 +23,8 @@
         <slf4j.version>1.7.25</slf4j.version>
         <slf4j.version.actual>1.7.25.b001</slf4j.version.actual>
         <grpc.version>1.14.0</grpc.version>
+        <grpc.version.actual>1.14.0.b001</grpc.version.actual>
+        <protobuf.version>3.5.1</protobuf.version>
     </properties>
 
 
@@ -468,6 +470,31 @@
                                     <id>org.eclipse.jetty:jetty-servlets:9.4.5.v20170502</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>io.grpc:grpc-core:${grpc.version}</id>
+                                    <source>true</source>
+                                    <override></override>
+                                    <instructions>
+                                        <Export-Package>
+                                            io.grpc;version="${grpc.version}",
+                                            io.grpc.inprocess;version="${grpc.version}",
+                                            io.grpc.internal;version="${grpc.version}",
+                                            io.grpc.util;version="${grpc.version}"
+                                        </Export-Package>
+                                        <Import-Package>!com.google.errorprone.annotations,*</Import-Package>
+                                        <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=io.grpc.ServerProvider,io.grpc.ManagedChannelProvider)"; cardinality:=multiple</Require-Capability>
+                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
+                                    </instructions>
+                                </artifact>
+                                <artifact>
+                                    <id>io.grpc:grpc-context:${grpc.version}</id>
+                                    <source>true</source>
+                                    <override></override>
+                                    <instructions>
+                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
+                                        <Fragment-Host>io.grpc.core</Fragment-Host>
+                                    </instructions>
+                                </artifact>
                                 <artifact>
                                     <id>io.grpc:grpc-stub:${grpc.version}</id>
                                     <source>true</source>
@@ -479,6 +506,20 @@
                                 <artifact>
                                     <id>io.grpc:grpc-netty:${grpc.version}</id>
                                     <source>true</source>
+                                    <override>true</override>
+                                    <instructions>
+                                        <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
+                                        <Provide-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=io.grpc.ServerProvider,io.grpc.ManagedChannelProvider)"</Provide-Capability>
+                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
+                                    </instructions>
+                                </artifact>
+                                <artifact>
+                                    <id>com.google.protobuf:protobuf-java:${protobuf.version}</id>
+                                    <source>true</source>
+                                    <override>true</override>
+                                    <instructions>
+                                        <Import-Package>!sun.misc.*,*;resolution:=optional</Import-Package>
+                                    </instructions>
                                 </artifact>
                             </artifacts>
                         </configuration>