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=50989e45f24989b9b3655b770e4007a5f152a6fd;hp=0693c09b734897c0e0ad4705e15b24df835146b8;hb=c2ac119862bcd9f55485959222754263a4cc7f2d;hpb=f23dc81afe57e77d20706a9a94002ce4c72f670d

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 0693c09b7..50989e45f 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -6,13 +6,15 @@
     <groupId>org.simantics</groupId>
     <artifactId>org.simantics.sdk.build.p2.site</artifactId>
     <packaging>pom</packaging>
-    <version>1.25.0</version>
+    <version>1.26.0</version>
 
     <properties>
         <itext.version.actual>2.1.7.b1</itext.version.actual>
         <lucene.version>4.9.0</lucene.version>
         <lucene.version.actual>4.9.0.b0003</lucene.version.actual>
         <lucene.prefix>org.apache.lucene4</lucene.prefix>
+        <jdom.version>2.0.6</jdom.version>
+        <jdom.version.actual>2.0.6.b0001</jdom.version.actual>
     </properties>
 
 
@@ -96,14 +98,6 @@
                                     <id>org.antlr:antlr-runtime:3.5.2</id>
                                     <source>true</source>
                                 </artifact>
-                                <artifact>
-                                    <id>org.apache.poi:poi:3.14</id>
-                                    <source>true</source>
-                                </artifact>
-                                <artifact>
-                                    <id>org.apache.poi:poi-ooxml:3.14</id>
-                                    <source>true</source>
-                                </artifact>
                                 <artifact>
                                     <id>org.apache.lucene:lucene-core:${lucene.version}</id>
                                     <source>true</source>
@@ -158,10 +152,12 @@
                                     </instructions>
                                 </artifact>
                                 <artifact>
-                                    <id>org.jdom:jdom2:2.0.6</id>
+                                    <id>org.jdom:jdom2:${jdom.version}</id>
                                     <source>true</source>
                                     <instructions>
                                         <Bundle-SymbolicName>org.jdom2</Bundle-SymbolicName>
+                                        <Bundle-Version>${jdom.version.actual}</Bundle-Version>
+                                        <Export-Package>*;version="${jdom.version}"</Export-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -193,10 +189,20 @@
                                     <id>org.ini4j:ini4j:0.5.4</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <!-- Needed by Apache POI 3.15 -->
+                                    <id>commons-codec:commons-codec:1.10</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>commons-collections:commons-collections:3.2.2</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <!-- Needed by Apache POI 3.15 -->
+                                    <id>org.apache.commons:commons-collections4:4.1</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>org.apache.commons:commons-compress:1.12</id>
                                     <source>true</source>
@@ -205,10 +211,20 @@
                                     <id>commons-lang:commons-lang:2.6</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <!-- Needed by Apache POI 3.15 -->
+                                    <id>commons-logging:commons-logging:1.2</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>commons-io:commons-io:1.4</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>org.apache.commons:commons-math3:3.6.1</id>
+                                    <source>true</source>
+                                </artifact>
+
                                 <artifact>
                                     <id>org.apache.pdfbox:pdfbox:2.0.3</id>
                                     <source>true</source>
@@ -221,6 +237,16 @@
                                     <id>org.apache.pdfbox:xmpbox:2.0.3</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <!-- Needed by Apache POI 3.15 -->
+                                    <id>org.apache.xmlbeans:xmlbeans:2.6.0</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <!-- Needed by Apache POI 3.15 -->
+                                    <id>com.github.virtuald:curvesapi:1.04</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>log4j:log4j:1.2.17</id>
                                     <source>true</source>
@@ -230,7 +256,7 @@
                                     </instructions>
                                 </artifact>
                                 <artifact>
-                                    <id>net.sf.ucanaccess:ucanaccess:3.0.6</id>
+                                    <id>net.sf.ucanaccess:ucanaccess:3.0.7</id>
                                     <source>true</source>
                                     <instructions>
                                         <Bundle-SymbolicName>net.ucanaccess</Bundle-SymbolicName>
@@ -285,27 +311,27 @@
                                     </instructions>
                                 </artifact>
                                 <artifact>
-                                    <id>javax.vecmath:vecmath:1.5.2</id>
-                                    <transitive>false</transitive>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Export-Package>javax.vecmath</Export-Package>
-                                    </instructions>
+                                    <id>org.mozilla:rhino:1.7.7.1</id>
+                                    <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>org.mozilla:rhino:1.7.7.1</id>
+                                    <id>net.java.dev.jna:jna:4.3.0</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>net.java.dev.jna:jna:4.2.2</id>
+                                    <id>net.java.dev.jna:jna-platform:4.3.0</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>net.java.dev.jna:jna-platform:4.2.2</id>
+                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.5</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.2</id>
+                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.8.5</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.8.5</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
@@ -330,6 +356,10 @@
                                     <id>com.koloboke:koloboke-impl-common-jdk8:1.0.0</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>com.esotericsoftware:kryo:4.0.0</id>
+                                    <source>true</source>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>