From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Sun, 20 Nov 2016 08:20:36 +0000 (+0200)
Subject: Added org.apache.commons.collections4 as external component.
X-Git-Tag: v1.25.0~48
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=89139d9db0b793b52ed00a9bd14280808b6017ac;p=simantics%2Fplatform.git

Added org.apache.commons.collections4 as external component.

This change also removes org.apache.poi.{,ooxml,ooxml-schemas} from the
external components as preparation for including manually bundled
org.apache.poi bundle version 3.15.0. org.apache.commons.collections4
was added because it is a dependency of this new version of POI.

Due to org.apache.poi.{,ooxml,ooxml-schemas} containing split packages
it is just easier to bundle the POI JARs into a single bundle to keep
bundle class loading happy.

refs #6813

Change-Id: Iefd4b52c0fafc4a0e7b6b9ed2bf6bac0e38a113e
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 0693c09b7..b4bdca36b 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -96,14 +96,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>
@@ -197,6 +189,10 @@
                                     <id>commons-collections:commons-collections:3.2.2</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <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>