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=49d48ea77823a98d50c1fe68e8ea7308fe092293;hp=8b445806f4336ecd2d88c599483c1d6658468de3;hb=575da3b86068d107fe7ef2c33f99658f3c8367a5;hpb=7e5740c78da6d078e2ab3388e4bf0bd3bad1b2f3

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 8b445806f..49d48ea77 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -15,8 +15,11 @@
         <lucene.prefix>org.apache.lucene4</lucene.prefix>
         <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>
     </properties>
 
 
@@ -326,42 +329,76 @@
                                     <id>net.java.dev.jna:jna-platform:4.3.0</id>
                                     <source>true</source>
                                 </artifact>
-                                <!-- We do not want 1.0.1 version of this !  -->
                                 <artifact>
-                                    <id>org.glassfish.hk2:osgi-resource-locator:2.5.0-b32</id>
+                                    <id>javax.servlet:javax.servlet-api:${javax.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>javax.servlet:javax.servlet-api:${javax.version}</id>
+                                    <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.core:jackson-core:2.8.8</id>
+                                    <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.core:jackson-databind:2.8.8</id>
+                                    <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.dataformat:jackson-dataformat-csv:2.8.8</id>
+                                    <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.dataformat:jackson-dataformat-xml:2.8.8</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.datatype:jackson-datatype-jsr310:2.8.8</id>
+                                    <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:1.7.25</id>
+                                    <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>
@@ -381,6 +418,9 @@
                                     <id>com.esotericsoftware:kryo:4.0.0</id>
                                     <source>true</source>
                                 </artifact>
+                                 <artifact>
+                                     <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.8</id>
+                                 </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.core:jersey-server:${jersey.version}</id>
                                     <source>true</source>
@@ -396,6 +436,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>