X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=releng%2Forg.simantics.sdk.build.p2.site%2Fpom.xml;h=87df82cfe3b4d8cf4ca3c32215da0b98eb68b932;hb=181013801c831415efe3cfe346546b5ab62c3214;hp=713b699f908a3e0324e39047db2f18314434d076;hpb=42a0891c9708711286efe7ba94701044bf69dc86;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 713b699f9..87df82cfe 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -23,18 +23,17 @@
         <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.b004</grpc.version.actual>
+        <grpc.version.actual>1.14.0.b007</grpc.version.actual>
         <protobuf.version>3.5.1</protobuf.version>
     </properties>
 
-
     <repositories>
         <!--
         <repository>
             <id>project-specific-deps</id>
             <name>project-specific-deps</name>
             <url>file:///${basedir}/repo</url>
-        </repository>
+        </repository>c.version.actual
         --> 
     </repositories>
 
@@ -472,45 +471,7 @@
                                     <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)";
-                                                cardinality:=multiple,
-                                            osgi.serviceloader;
-                                                filter:="(osgi.serviceloader=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>
-                                </artifact>
-                                <artifact>
-                                    <id>io.grpc:grpc-protobuf:${grpc.version}</id>
+                                    <id>io.grpc:io.grpc:${grpc.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
@@ -528,7 +489,8 @@
                                              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.netty.transport;bundle-version="4.1.27",
+                                             io.grpc
                                         </Require-Bundle>
                                         <Import-Package>!io.netty.*,*;resolution:=optional</Import-Package>
                                         <Require-Capability>