From: jsimomaa <jani.simomaa@gmail.com>
Date: Mon, 3 Sep 2018 13:57:37 +0000 (+0300)
Subject: Make io.grpc.context as fragment bundle to fix duplicate package name
X-Git-Tag: v1.43.0~136^2~387^2~14
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F90%2F2090%2F1;p=simantics%2Fplatform.git

Make io.grpc.context as fragment bundle to fix duplicate package name

gitlab #98

Change-Id: Ia90030494ac42aac193d5a852464823224540dcf
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 73c196913..7f1d8d59d 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -23,6 +23,7 @@
         <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>
 
@@ -488,6 +489,7 @@
                                     <source>true</source>
                                     <override></override>
                                     <instructions>
+                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
                                         <Fragment-Host>io.grpc.core</Fragment-Host>
                                     </instructions>
                                 </artifact>