X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=releng%2Forg.simantics.sdk.build.p2.site%2Fpom.xml;h=cea0614ada9473204b859e62106ff5da46c7b6e0;hb=2a8aad7a8f2f0cfd5a6afb7df4c7b7ee0bafc22e;hp=f20d49f4ad91be9674954313371b3615f026fbb1;hpb=2e230d635a7927fa5452d675f9bdc84599c8671a;p=simantics%2Fplatform.git

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index f20d49f4a..cea0614ad 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -10,17 +10,23 @@
 
     <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.b004</grpc.version.actual>
+        <protobuf.version>3.5.1</protobuf.version>
     </properties>
 
-
     <repositories>
         <!--
         <repository>
@@ -98,8 +104,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>
@@ -154,6 +165,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>
@@ -335,29 +350,68 @@
                                     <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>org.slf4j:slf4j-api:1.7.25</id>
+                                    <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>
                                     <source>true</source>
                                     <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>
                                 </artifact>
                                 <artifact>
@@ -378,7 +432,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>
@@ -395,6 +450,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>
@@ -408,6 +466,95 @@
                                     <id>org.jsoup:jsoup:1.8.3</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>org.eclipse.jetty:jetty-servlets:9.4.5.v20170502</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>io.grpc:io.grpc:${grpc.version}</id>
+                                    <source>true</source>
+                                </artifact>
+                                <!-- <artifact>
+                                    <id>io.grpc:grpc-core:${grpc.version}</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>
+                                    <source>true</source>
+                                    <override></override>
+                                    <instructions>
+                                        <Bundle-Version>${grpc.version.actual}</Bundle-Version>
+                                        <Fragment-Host>io.grpc.core</Fragment-Host>
+                                    </instructions>
+                                </artifact>-->
+                                <artifact>
+                                    <id>io.grpc:grpc-stub:${grpc.version}</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>io.grpc:grpc-protobuf:${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"
+                                        </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>
                             </artifacts>
                         </configuration>
                     </execution>