]> gerrit.simantics Code Review - simantics/platform.git/commitdiff
Update to io.grcp 1.21.0 and protobuf 3.7.1 53/2953/1
authorMarko Luukkainen <marko.luukkainen@semantum.fi>
Tue, 18 Jun 2019 14:01:23 +0000 (17:01 +0300)
committerMarko Luukkainen <marko.luukkainen@semantum.fi>
Tue, 18 Jun 2019 14:01:23 +0000 (17:01 +0300)
Trying a workaround for split package conflicts.

gitlab #308

Change-Id: I73625512c49eef5380752cd43e15b2708351a495

releng/org.simantics.sdk.build.p2.site/pom.xml

index 9d7c839ae9f7255716902cbe2454d9bf3f70b0bb..6267ace057cf99a3c0b4a769eca5cae95f03dc55 100644 (file)
                                 <artifact>
                                     <id>io.grpc:grpc-core:${grpc.version}</id>
                                     <source>true</source>
+                                </artifact>
+                                                               <artifact>
+                                    <id>io.grpc:grpc-context:${grpc.version}</id>
+                                    <source>true</source>
+                                                                       <override>true</override>
+                                    <instructions>
+                                                                           <Fragment-Host>io.grpc.core</Fragment-Host> 
+                                                                       </instructions>
                                 </artifact>
                                                                <artifact>
                                     <id>io.grpc:grpc-protobuf:${grpc.version}</id>