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=5f40cf19edc972f41444804af0bb3d44134fd38a;hp=a42b854b13a7187265e3e3dff5c0e98e73783491;hb=701cacf5db496298ff8c6d33e96367e63c61e060;hpb=14be406949d7d3c83040518c833f55102bada07a

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index a42b854b1..5f40cf19e 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -15,6 +15,10 @@
         <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>
     </properties>
 
 
@@ -25,7 +29,7 @@
             <name>project-specific-deps</name>
             <url>file:///${basedir}/repo</url>
         </repository>
-        -->
+        --> 
     </repositories>
 
     <build>
@@ -306,6 +310,16 @@
                                     <id>org.mozilla:rhino:1.7.7.1</id>
                                     <source>true</source>
                                 </artifact>
+                                <!-- org.eclipse.epp.mpc.core.win32 plug-in requires 4.1.0 -->
+                                <artifact>
+                                    <id>net.java.dev.jna:jna:4.1.0</id>
+                                    <source>true</source>
+                                </artifact>
+                                 <!-- org.eclipse.epp.mpc.core.win32 plug-in requires 4.1.0 -->
+                                <artifact>
+                                    <id>net.java.dev.jna:jna-platform:4.1.0</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>net.java.dev.jna:jna:4.3.0</id>
                                     <source>true</source>
@@ -315,32 +329,74 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.8</id>
+                                    <id>javax.servlet:javax.servlet-api:${javax.version}</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>com.fasterxml.jackson.core:jackson-core:${jackson.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.core:jackson-databind:2.8.8</id>
+                                    <id>com.fasterxml.jackson.core:jackson-annotations:${jackson.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.8.8</id>
+                                    <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-xml:2.8.8</id>
+                                    <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.datatype:jackson-datatype-jsr310: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>org.slf4j:slf4j-api:1.7.25</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.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>
                                     <source>true</source>
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Name>SLF4J API Module</Bundle-Name>
                                         <Bundle-SymbolicName>org.slf4j.api</Bundle-SymbolicName>
+                                        <Export-Package>*;version=${slf4j.version}</Export-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -360,26 +416,40 @@
                                     <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:2.25.1</id>
+                                    <id>org.glassfish.jersey.core:jersey-server:${jersey.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>org.glassfish.jersey.core:jersey-client:2.25.1</id>
+                                    <id>org.glassfish.jersey.core:jersey-client:${jersey.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>org.glassfish.jersey.media:jersey-media-multipart:2.25.1</id>
+                                    <id>org.glassfish.jersey.media:jersey-media-multipart:${jersey.version}</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>org.glassfish.jersey.media:jersey-media-json-jackson:2.25.1</id>
+                                    <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>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
                                     <id>org.jboss.windup.decompiler:decompiler-procyon:4.0.0.Beta1</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>org.jsoup:jsoup:1.8.3</id>
+                                    <source>true</source>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>