From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 19 Jun 2019 22:00:59 +0000 (+0300)
Subject: Update to io.grcp 1.21.0 and protobuf 3.7.1
X-Git-Tag: v1.43.0~136^2~143
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=ca7c38320fa95e158f6cae533b99ace323201918;ds=sidebyside

Update to io.grcp 1.21.0 and protobuf 3.7.1

Include 4.1.35.Final netty bundles in maven external dependencies to
keep netty in the same version that is included by GRPC 1.21.0 in the
third-party repository.

Also removed org.apache.xmlbeans and com.github.virtuald.curvesapi from
external maven dependencies since they are only needed by Apache POI
3.15.0 which is included in the manual external dependencies in the
third-party repository.

gitlab #308

Change-Id: I8c7eb2a14f4df585e735540945ade8a18859cb6a
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 34919d2af..81466a97f 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -22,9 +22,9 @@
         <jersey.version>2.25.1</jersey.version>
         <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.b007</grpc.version.actual>
-        <protobuf.version>3.5.1</protobuf.version>
+        <grpc.version>1.21.0</grpc.version>
+        <grpc.version.actual>1.21.0</grpc.version.actual>
+        <protobuf.version>3.7.1</protobuf.version>
         <zeroturnaround.version>1.10</zeroturnaround.version>
         <eclipse.collections.version>9.2.0</eclipse.collections.version>
         <caffeine.version>2.6.2</caffeine.version>
@@ -262,16 +262,17 @@
                                     <id>org.apache.pdfbox:xmpbox:2.0.3</id>
                                     <source>true</source>
                                 </artifact>
+                                <!-- Needed by Apache POI 3.15, however these are included in third-party repository manually -->
+                                <!--
                                 <artifact>
-                                    <!-- Needed by Apache POI 3.15 -->
                                     <id>org.apache.xmlbeans:xmlbeans:2.6.0</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <!-- Needed by Apache POI 3.15 -->
                                     <id>com.github.virtuald:curvesapi:1.04</id>
                                     <source>true</source>
                                 </artifact>
+                                -->
                                 <artifact>
                                     <id>log4j:log4j:1.2.17</id>
                                     <source>true</source>
@@ -489,8 +490,8 @@
                                     <id>org.zeroturnaround:zt-exec:${zeroturnaround.version}</id>
                                     <source>true</source>
                                 </artifact>
-								<!-- Since 1.21.0 grpc, a manually set up plugin is provided in third-party repository.
-								     Note: grpc-core, grpc-context, and grpc-stub (maybe others as well) must be bundled into same plug-in, since they contain split packages.
+                                <!-- Since 1.21.0 grpc, a manually set up plugin is provided in third-party repository.
+                                     Note: grpc-core, grpc-context, and grpc-stub (maybe others as well) must be bundled into same plug-in, since they contain split packages.
                                 <artifact>
                                     <id>io.grpc:io.grpc:${grpc.version}</id>
                                     <source>true</source>
@@ -535,36 +536,88 @@
                                         <Import-Package>!sun.misc.*,*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
-								-->
-								<!-- grpc 1.21.0 dependencies -->
-								<artifact>
+                                -->
+                                <!-- grpc 1.21.0 dependencies -->
+                                <artifact>
                                     <id>io.opencensus:opencensus-api:0.21.0</id>
                                     <source>true</source>
-								</artifact>
-								<artifact>
+                                </artifact>
+                                <artifact>
                                     <id>com.google.code.gson:gson:2.7</id>
                                     <source>true</source>
-								</artifact>
-								<artifact>
+                                </artifact>
+                                <artifact>
                                     <id>com.google.android:annotations:4.1.1.4</id>
                                     <source>true</source>
-								</artifact>
-								<artifact>
+                                </artifact>
+                                <artifact>
                                     <id>io.opencensus:opencensus-contrib-grpc-metrics:0.21.0</id>
                                     <source>true</source>
-								</artifact>
-								<artifact>
-                                    <id>com.google.protobuf:protobuf-java:3.7.1</id>
+                                </artifact>
+                                <artifact>
+                                    <id>com.google.protobuf:protobuf-java:${protobuf.version}</id>
                                     <source>true</source>
                                 </artifact>
-								<artifact>
+                                <artifact>
                                     <id>com.google.api.grpc:proto-google-common-protos:1.12.0</id>
                                     <source>true</source>
                                 </artifact>
-								<artifact>
+                                <artifact>
                                     <id>com.google.errorprone:error_prone_annotations:2.3.2</id>
                                     <source>true</source>
                                 </artifact>
+
+                                <!-- Netty is needed by com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1 -->
+                                <artifact>
+                                    <id>io.netty:netty-buffer:4.1.35.Final</id>
+                                    <source>true</source>
+                                    <transitive>true</transitive>
+                                </artifact>
+                                <artifact>
+                                    <id>io.netty:netty-codec:4.1.35.Final</id>
+                                    <source>true</source>
+                                    <transitive>true</transitive>
+                                </artifact>
+                                <artifact>
+                                    <id>io.netty:netty-codec-http:4.1.35.Final</id>
+                                    <source>true</source>
+                                    <transitive>true</transitive>
+                                </artifact>
+                                <artifact>
+                                    <id>io.netty:netty-codec-http2:4.1.35.Final</id>
+                                    <source>true</source>
+                                    <transitive>true</transitive>
+                                </artifact>
+                                <artifact>
+                                    <id>io.netty:netty-codec-socks:4.1.35.Final</id>
+                                    <source>true</source>
+                                    <transitive>true</transitive>
+                                </artifact>
+                                <artifact>
+                                    <id>io.netty:netty-common:4.1.35.Final</id>
+                                    <source>true</source>
+                                    <transitive>true</transitive>
+                                </artifact>
+                                <artifact>
+                                    <id>io.netty:netty-handler:4.1.35.Final</id>
+                                    <source>true</source>
+                                    <transitive>true</transitive>
+                                </artifact>
+                                <artifact>
+                                    <id>io.netty:netty-handler-proxy:4.1.35.Final</id>
+                                    <source>true</source>
+                                    <transitive>true</transitive>
+                                </artifact>
+                                <artifact>
+                                    <id>io.netty:netty-resolver:4.1.35.Final</id>
+                                    <source>true</source>
+                                    <transitive>true</transitive>
+                                </artifact>
+                                <artifact>
+                                    <id>io.netty:netty-transport:4.1.35.Final</id>
+                                    <source>true</source>
+                                    <transitive>true</transitive>
+                                </artifact>
                                 <artifact>
                                     <id>com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1</id>
                                     <source>true</source>