X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=releng%2Forg.simantics.sdk.build.p2.site%2Fpom.xml;h=4e771ec07704492bcb97283456ce453d675ea47a;hp=c7a210ecb7ae2eade95f6e46eeef5497f7321a41;hb=2a419817a98ea82dbdb47962d89f3c5991a245f6;hpb=94423c4feb729fb318409899fb74eb3471557df3

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index c7a210ecb..4e771ec07 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -22,9 +22,12 @@
         <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.b004</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>
     </properties>
 
     <repositories>
@@ -33,7 +36,7 @@
             <id>project-specific-deps</id>
             <name>project-specific-deps</name>
             <url>file:///${basedir}/repo</url>
-        </repository>
+        </repository>c.version.actual
         --> 
     </repositories>
 
@@ -222,8 +225,12 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>org.apache.commons:commons-compress:1.12</id>
+                                    <id>org.apache.commons:commons-compress:1.18</id>
                                     <source>true</source>
+                                    <override>true</override>
+                                    <instructions>
+                                        <Bundle-SymbolicName>org.apache.commons.compress</Bundle-SymbolicName>
+                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>commons-lang:commons-lang:2.6</id>
@@ -255,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>
@@ -285,7 +293,7 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>org.eclipse.collections:eclipse-collections-api:8.1.0</id>
+                                    <id>org.eclipse.collections:eclipse-collections-api:${eclipse.collections.version}</id>
                                     <override>true</override>
                                     <source>true</source>
                                     <instructions>
@@ -293,8 +301,12 @@
                                     </instructions>
                                 </artifact>
                                 <artifact>
-                                    <id>org.eclipse.collections:eclipse-collections:8.1.0</id>
+                                    <id>org.eclipse.collections:eclipse-collections:${eclipse.collections.version}</id>
                                     <source>true</source>
+                                    <instructions>
+                                        <Require-Bundle>org.eclipse.collections.eclipse-collections-api;bundle-version="${eclipse.collections.version}"</Require-Bundle>
+                                        <Import-Package>!org.eclipse.*,!sun.misc.*,*;resolution:=optional</Import-Package>
+                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>net.sf.trove4j:trove4j:3.0.3</id>
@@ -463,53 +475,29 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>org.jsoup:jsoup:1.8.3</id>
+                                    <id>org.jsoup:jsoup:1.11.3</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>org.eclipse.jetty:jetty-servlets:9.4.5.v20170502</id>
+                                    <id>org.yaml:snakeyaml:1.23</id>
                                     <source>true</source>
                                 </artifact>
-                                <!-- <artifact>
-                                    <id>io.grpc:grpc-core:${grpc.version}</id>
+                                <artifact>
+                                    <id>org.eclipse.jetty:jetty-servlets:9.4.5.v20170502</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>
-                                        <Require-Capability>
-                                            osgi.extender;
-                                                filter:="(osgi.extender=osgi.serviceloader.processor)",
-                                            osgi.serviceloader;
-                                                filter:="(osgi.serviceloader=io.grpc.ServerProvider)";
-                                                cardinality:=multiple,
-                                            osgi.serviceloader;
-                                                filter:="(osgi.serviceloader=io.grpc.ManagedChannelProvider)";
-                                                cardinality:=multiple
-                                        </Require-Capability>
-                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
-                                    </instructions>
                                 </artifact>
                                 <artifact>
-                                    <id>io.grpc:grpc-context:${grpc.version}</id>
+                                    <id>org.eclipse.jetty:jetty-server:9.4.5.v20170502</id>
                                     <source>true</source>
-                                    <override></override>
-                                    <instructions>
-                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
-                                        <Fragment-Host>io.grpc.core</Fragment-Host>
-                                    </instructions>
-                                </artifact>-->
+                                </artifact>
                                 <artifact>
-                                    <id>io.grpc:grpc-stub:${grpc.version}</id>
+                                    <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.
                                 <artifact>
-                                    <id>io.grpc:grpc-protobuf:${grpc.version}</id>
+                                    <id>io.grpc:io.grpc:${grpc.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
@@ -527,7 +515,8 @@
                                              io.netty.handler;bundle-version="4.1.27",
                                              io.netty.handler-proxy;bundle-version="4.1.27",
                                              io.netty.resolver;bundle-version="4.1.27",
-                                             io.netty.transport;bundle-version="4.1.27"
+                                             io.netty.transport;bundle-version="4.1.27",
+                                             io.grpc
                                         </Require-Bundle>
                                         <Import-Package>!io.netty.*,*;resolution:=optional</Import-Package>
                                         <Require-Capability>
@@ -551,6 +540,105 @@
                                         <Import-Package>!sun.misc.*,*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
+                                -->
+                                <!-- grpc 1.21.0 dependencies -->
+                                <artifact>
+                                    <id>io.opencensus:opencensus-api:0.21.0</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>com.google.code.gson:gson:2.7</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>com.google.android:annotations:4.1.1.4</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>io.opencensus:opencensus-contrib-grpc-metrics:0.21.0</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>com.google.protobuf:protobuf-java:${protobuf.version}</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>com.google.api.grpc:proto-google-common-protos:1.12.0</id>
+                                    <source>true</source>
+                                </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>
+                                    <transitive>false</transitive>
+                                </artifact>
+                                <artifact>
+                                    <id>com.github.ben-manes.caffeine:caffeine:${caffeine.version}</id>
+                                    <source>true</source>
+                                    <override>true</override>
+                                    <instructions>
+                                        <Bundle-SymbolicName>com.github.benmanes.caffeine</Bundle-SymbolicName>
+                                    </instructions>
+                                </artifact>
+                                <artifact>
+                                    <id>net.jcip:jcip-annotations:1.0</id>
+                                    <source>true</source>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>