X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=releng%2Forg.simantics.sdk.build.p2.site%2Fpom.xml;h=694a169910d9a5048e2a89661ee75766f886c1f3;hb=refs%2Fchanges%2F07%2F2107%2F1;hp=d8122670b1fd4af59a7ae20256af8739ccc7f526;hpb=401c2badc6e0811c22645f5c3d327466d35d5984;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 d8122670b..694a16991 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -23,11 +23,10 @@
         <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.b002</grpc.version.actual>
+        <grpc.version.actual>1.14.0.b005</grpc.version.actual>
         <protobuf.version>3.5.1</protobuf.version>
     </properties>
 
-
     <repositories>
         <!--
         <repository>
@@ -433,7 +432,8 @@
                                     <source>true</source>
                                 </artifact>
                                  <artifact>
-                                     <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.8</id>
+                                     <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.14</id>
+                                     <source>true</source>
                                  </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.core:jersey-server:${jersey.version}</id>
@@ -471,6 +471,10 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
+                                    <id>io.grpc:io.grpc:${grpc.version}</id>
+                                    <source>true</source>
+                                </artifact>
+                                <!-- <artifact>
                                     <id>io.grpc:grpc-core:${grpc.version}</id>
                                     <source>true</source>
                                     <override></override>
@@ -503,7 +507,7 @@
                                         <Bundle-Version>${grpc.version.actual}</Bundle-Version>
                                         <Fragment-Host>io.grpc.core</Fragment-Host>
                                     </instructions>
-                                </artifact>
+                                </artifact>-->
                                 <artifact>
                                     <id>io.grpc:grpc-stub:${grpc.version}</id>
                                     <source>true</source>
@@ -517,6 +521,19 @@
                                     <source>true</source>
                                     <override>true</override>
                                     <instructions>
+                                        <Require-Bundle>
+                                             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"
+                                        </Require-Bundle>
+                                        <Import-Package>!io.netty.*,*;resolution:=optional</Import-Package>
                                         <Require-Capability>
                                             osgi.extender;
                                                 filter:="(osgi.extender=osgi.serviceloader.registrar)"