From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Sun, 20 Nov 2016 22:37:23 +0000 (+0200)
Subject: Depend only on org.apache.poi/3.15.0.
X-Git-Tag: v1.25.0~44
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=b8392422ec5b5961202d941ec447018526d26dd2

Depend only on org.apache.poi/3.15.0.

refs #6813

Change-Id: Ibb75d457a908e43ee01a8579d3bd4c1414c6d20a
---

diff --git a/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF b/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF
index a61255e1c..08fdd9180 100644
--- a/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF
@@ -21,8 +21,7 @@ Require-Bundle: org.simantics.layer0.utils,
  org.simantics.datatypes.ontology;bundle-version="1.1.0",
  org.simantics.document.server.io;bundle-version="0.0.1",
  org.simantics.simulator.variable,
- org.apache.poi;bundle-version="3.14.0",
- org.apache.poi.ooxml;bundle-version="3.14.0",
+ org.apache.poi;bundle-version="3.15.0",
  it.unimi.dsi.fastutil,
  org.simantics.structural.synchronization.client,
  org.simantics.db.indexing,
diff --git a/features/org.simantics.spreadsheet.feature/feature.xml b/features/org.simantics.spreadsheet.feature/feature.xml
index dd1af0727..20b434dc5 100644
--- a/features/org.simantics.spreadsheet.feature/feature.xml
+++ b/features/org.simantics.spreadsheet.feature/feature.xml
@@ -121,18 +121,4 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.poi.ooxml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.poi.ooxml-schemas"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>