Merge "Re-enabled Acorn transaction cancellation support for testing"

[simantics/platform.git] / releng / org.simantics.sdk.build.p2.site / pom.xml

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index b4bdca36b70e869abed96349551aa63e265e3a03..828ae537ffa3a824aa06b79c7daa227257d0009a 100644 (file)
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -6,7 +6,7 @@
     <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>
@@ -185,11 +185,17 @@
                                     <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>
@@ -201,6 +207,11 @@
                                     <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>
@@ -217,6 +228,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>
@@ -226,7 +247,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>
@@ -301,7 +322,15 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.2</id>
+                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.5</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <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>