From: jsimomaa <jani.simomaa@gmail.com>
Date: Mon, 3 Sep 2018 11:03:35 +0000 (+0300)
Subject: Make import com.sun optional in protobuf (for io.grpc)
X-Git-Tag: v1.43.0~136^2~387^2~16
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=0ea405eb1012e9c09610b2b63a0b10f836e12b64

Make import com.sun optional in protobuf (for io.grpc)

gitlab #98

Change-Id: I38fd280bc04d67511f89bc200b66d9946cb8f9de
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index d70e5e907..e7dac15d3 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>
+        <protobuf.version>3.5.1</protobuf.version>
     </properties>
 
 
@@ -480,6 +481,14 @@
                                     <id>io.grpc:grpc-netty:${grpc.version}</id>
                                     <source>true</source>
                                 </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>
                     </execution>