From: jsimomaa <jani.simomaa@gmail.com>
Date: Mon, 3 Sep 2018 13:28:52 +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~15
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F2089%2F1;p=simantics%2Fplatform.git

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

gitlab #98

Change-Id: Icd8ac3b4cda5d046a84e859e0c84fa036eb08f83
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index e7dac15d3..73c196913 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -469,6 +469,28 @@
                                     <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>
+                                    </instructions>
+                                </artifact>
+                                <artifact>
+                                    <id>io.grpc:grpc-context:${grpc.version}</id>
+                                    <source>true</source>
+                                    <override></override>
+                                    <instructions>
+                                        <Fragment-Host>io.grpc.core</Fragment-Host>
+                                    </instructions>
+                                </artifact>
                                 <artifact>
                                     <id>io.grpc:grpc-stub:${grpc.version}</id>
                                     <source>true</source>