X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=releng%2Forg.simantics.sdk.build.p2.site%2Fpom.xml;h=e7dac15d3ee91b94ecb0608dac2553a9b24c9557;hb=0ea405eb1012e9c09610b2b63a0b10f836e12b64;hp=00a2b83d4de23b32f59fbb54c59e76054f2519bd;hpb=7700e0b83f7bbc53f536c512a7d3cb6cc087ead3;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 00a2b83d4..e7dac15d3 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -6,15 +6,24 @@
     <groupId>org.simantics</groupId>
     <artifactId>org.simantics.sdk.build.p2.site</artifactId>
     <packaging>pom</packaging>
-    <version>1.26.0</version>
+    <version>1.30.0</version>
 
     <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>
+        <protobuf.version>3.5.1</protobuf.version>
     </properties>
 
 
@@ -25,7 +34,7 @@
             <name>project-specific-deps</name>
             <url>file:///${basedir}/repo</url>
         </repository>
-        -->
+        --> 
     </repositories>
 
     <build>
@@ -33,12 +42,12 @@
             <plugin>
                 <groupId>org.eclipse.tycho.extras</groupId>
                 <artifactId>tycho-p2-extras-plugin</artifactId>
-                <version>0.25.0</version>
+                <version>1.0.0</version>
             </plugin>
             <plugin>
                 <groupId>org.reficio</groupId>
                 <artifactId>p2-maven-plugin</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>1.2.0</version>
                 <executions>
                     <execution>
                         <id>default-cli</id>
@@ -95,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>
@@ -151,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>
@@ -263,11 +281,11 @@
                                     </instructions>
                                 </artifact>
                                 <artifact>
-                                    <id>it.unimi.dsi:fastutil:7.0.13</id>
+                                    <id>it.unimi.dsi:fastutil:7.2.1</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>org.eclipse.collections:eclipse-collections-api:7.1.0</id>
+                                    <id>org.eclipse.collections:eclipse-collections-api:8.1.0</id>
                                     <override>true</override>
                                     <source>true</source>
                                     <instructions>
@@ -275,16 +293,8 @@
                                     </instructions>
                                 </artifact>
                                 <artifact>
-                                    <id>org.eclipse.collections:eclipse-collections:7.1.0</id>
-                                    <source>true</source>
-                                </artifact>
-                                <artifact>
-                                    <id>net.sf.trove4j:trove4j:2.1.0</id>
+                                    <id>org.eclipse.collections:eclipse-collections:8.1.0</id>
                                     <source>true</source>
-                                    <instructions>
-                                        <Bundle-Name>GNU Trove 2</Bundle-Name>
-                                        <Bundle-SymbolicName>gnu.trove2</Bundle-SymbolicName>
-                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>net.sf.trove4j:trove4j:3.0.3</id>
@@ -314,6 +324,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>
@@ -323,32 +343,75 @@
                                     <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-annotations:${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-databind:${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.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: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.datatype:jackson-datatype-jsr310: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>org.slf4j:slf4j-api:1.7.25</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.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>
@@ -368,26 +431,64 @@
                                     <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>
+                                <artifact>
+                                    <id>org.eclipse.jetty:jetty-servlets:9.4.5.v20170502</id>
+                                    <source>true</source>
+                                </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>
+                                </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>
@@ -409,11 +510,4 @@
         </plugins>
     </build>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>reficio</id>
-            <url>http://repo.reficio.org/maven/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
 </project>