From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Sun, 20 Nov 2016 09:08:47 +0000 (+0200)
Subject: Added back dependencies of org.apache.poi 3.15.
X-Git-Tag: v1.25.0~47
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=9341bb59a63a715d59ab1759a129ae1c435c1e97;p=simantics%2Fplatform.git

Added back dependencies of org.apache.poi 3.15.

Added org.apache.commons.codec, org.apache.commons.logging,
com.github.virtuald.curvesapi, org.apache.xmlbeans back to external
components to be used by org.apache.poi 3.15 which will be manually
bundled.

refs #6813

Change-Id: I9dbd405a0106a8b05e22d35bcf7a187584b86e57
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index b4bdca36b..8d13de615 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -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>