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=e2a924f2f05a821cd9e117c850f65352872ccde4;hb=23e4bfe51f44aab50686fff6bc0eb3c7919b72ed;hpb=57342120305416ae23a8313070a1f51103df6902

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index e2a924f2f..34919d2af 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -10,25 +10,33 @@
 
     <properties>
         <itext.version.actual>2.1.7.b1</itext.version.actual>
+        <antlr.version>3.5.2</antlr.version>
         <lucene.version>4.9.0</lucene.version>
         <lucene.version.actual>4.9.0.b0003</lucene.version.actual>
         <lucene.prefix>org.apache.lucene4</lucene.prefix>
+        <jaxen.version>1.1.6</jaxen.version>
         <jdom.version>2.0.6</jdom.version>
         <jdom.version.actual>2.0.6.b0001</jdom.version.actual>
         <jackson.version>2.8.8</jackson.version>
         <javax.version>3.1.0</javax.version>
         <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>
+        <zeroturnaround.version>1.10</zeroturnaround.version>
+        <eclipse.collections.version>9.2.0</eclipse.collections.version>
+        <caffeine.version>2.6.2</caffeine.version>
     </properties>
 
-
     <repositories>
         <!--
         <repository>
             <id>project-specific-deps</id>
             <name>project-specific-deps</name>
             <url>file:///${basedir}/repo</url>
-        </repository>
+        </repository>c.version.actual
         --> 
     </repositories>
 
@@ -99,8 +107,13 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
-                                    <id>org.antlr:antlr-runtime:3.5.2</id>
+                                    <id>org.antlr:antlr-runtime:${antlr.version}</id>
                                     <source>true</source>
+                                    <instructions>
+                                        <Bundle-SymbolicName>org.antlr.runtime</Bundle-SymbolicName>
+                                        <Bundle-Version>${antlr.version}</Bundle-Version>
+                                        <Export-Package>*;version="${antlr.version}"</Export-Package>
+                                    </instructions>                                    
                                 </artifact>
                                 <artifact>
                                     <id>org.apache.lucene:lucene-core:${lucene.version}</id>
@@ -155,6 +168,10 @@
                                         <Import-Package>!org.apache.lucene.*,*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
+                                <artifact>
+                                    <id>jaxen:jaxen:${jaxen.version}</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>org.jdom:jdom2:${jdom.version}</id>
                                     <source>true</source>
@@ -208,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>
@@ -271,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>
@@ -279,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>
@@ -336,21 +361,58 @@
                                     <id>com.fasterxml.jackson.core:jackson-core:${jackson.version}</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>com.fasterxml.jackson.core:jackson-annotations:${jackson.version}</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>com.fasterxml.jackson.core:jackson-databind:${jackson.version}</id>
                                     <source>true</source>
+                                    <excludes>
+                                        <exclude>com.fasterxml.jackson.*</exclude>
+                                    </excludes>
                                 </artifact>
                                 <artifact>
                                     <id>com.fasterxml.jackson.dataformat:jackson-dataformat-csv:${jackson.version}</id>
                                     <source>true</source>
+                                    <excludes>
+                                        <exclude>com.fasterxml.jackson.*</exclude>
+                                    </excludes>
                                 </artifact>
                                 <artifact>
                                     <id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson.version}</id>
                                     <source>true</source>
+                                    <excludes>
+                                        <exclude>com.fasterxml.jackson.*</exclude>
+                                    </excludes>
                                 </artifact>
                                 <artifact>
                                     <id>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson.version}</id>
                                     <source>true</source>
+                                    <excludes>
+                                        <exclude>com.fasterxml.jackson.*</exclude>
+                                    </excludes>
+                                </artifact>
+                                <artifact>
+                                    <id>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:${jackson.version}</id>
+                                    <source>true</source>
+                                    <excludes>
+                                        <exclude>com.fasterxml.jackson.*</exclude>
+                                    </excludes>
+                                </artifact>
+                                <artifact>
+                                    <id>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${jackson.version}</id>
+                                    <source>true</source>
+                                    <excludes>
+                                        <exclude>com.fasterxml.jackson.*</exclude>
+                                    </excludes>
+                                </artifact>
+                                <artifact>
+                                    <id>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${jackson.version}</id>
+                                    <source>true</source>
+                                    <excludes>
+                                        <exclude>com.fasterxml.jackson.*</exclude>
+                                    </excludes>
                                 </artifact>
                                 <artifact>
                                     <id>org.slf4j:slf4j-api:${slf4j.version}</id>
@@ -358,6 +420,7 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Name>SLF4J API Module</Bundle-Name>
+                                        <Bundle-Version>${slf4j.version.actual}</Bundle-Version>
                                         <Bundle-SymbolicName>org.slf4j.api</Bundle-SymbolicName>
                                         <Export-Package>*;version=${slf4j.version}</Export-Package>
                                     </instructions>
@@ -380,7 +443,8 @@
                                     <source>true</source>
                                 </artifact>
                                  <artifact>
-                                     <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.8</id>
+                                     <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.14</id>
+                                     <source>true</source>
                                  </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.core:jersey-server:${jersey.version}</id>
@@ -397,6 +461,9 @@
                                 <artifact>
                                     <id>org.glassfish.jersey.media:jersey-media-json-jackson:${jersey.version}</id>
                                     <source>true</source>
+                                    <excludes>
+                                        <exclude>com.fasterxml.jackson.*</exclude>
+                                    </excludes>
                                 </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.containers:jersey-container-servlet-core:${jersey.version}</id>
@@ -407,7 +474,112 @@
                                     <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.yaml:snakeyaml:1.23</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>org.eclipse.jetty:jetty-servlets:9.4.5.v20170502</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <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>
+                                </artifact>
+                                <artifact>
+                                    <id>io.grpc:grpc-netty:${grpc.version}</id>
+                                    <source>true</source>
+                                    <override>true</override>
+                                    <instructions>
+                                        <Require-Bundle>
+                                             io.netty.buffer;bundle-version="4.1.27",
+                                             io.netty.codec;bundle-version="4.1.27",
+                                             io.netty.codec-http;bundle-version="4.1.27",
+                                             io.netty.codec-http2;bundle-version="4.1.27",
+                                             io.netty.codec-socks;bundle-version="4.1.27",
+                                             io.netty.common;bundle-version="4.1.27",
+                                             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.grpc
+                                        </Require-Bundle>
+                                        <Import-Package>!io.netty.*,*;resolution:=optional</Import-Package>
+                                        <Require-Capability>
+                                            osgi.extender;
+                                                filter:="(osgi.extender=osgi.serviceloader.registrar)"
+                                        </Require-Capability>
+                                        <Provide-Capability>
+                                            osgi.serviceloader;
+                                                osgi.serviceloader=io.grpc.ServerProvider,
+                                            osgi.serviceloader;
+                                                osgi.serviceloader=io.grpc.ManagedChannelProvider
+                                        </Provide-Capability>
+                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
+                                    </instructions>
+                                </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>
+								-->
+								<!-- 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>