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=34919d2af8eba203cc7a256a1699087761a6dd14;hp=61035258fc2715492335dacdfcfbc470a5d811c1;hb=23e4bfe51f44aab50686fff6bc0eb3c7919b72ed;hpb=e6ac5b3fd55e041ca1d73707c28db8f25f65edd1

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 61035258f..34919d2af 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -26,6 +26,8 @@
         <grpc.version.actual>1.14.0.b007</grpc.version.actual>
         <protobuf.version>3.5.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>
@@ -225,6 +227,10 @@
                                 <artifact>
                                     <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>
@@ -286,7 +292,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>
@@ -294,8 +300,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>
@@ -479,6 +489,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.
                                 <artifact>
                                     <id>io.grpc:io.grpc:${grpc.version}</id>
                                     <source>true</source>
@@ -522,12 +534,54 @@
                                     <instructions>
                                         <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:3.7.1</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>
                                 <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>