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 a61255e1ccd2a6898a6475cedef87ce6ae321802..08fdd9180b498205454594de8b8a619b90322ce5 100644 (file)
--- 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 dd1af072701285d81d48650d84e172bb800ee373..20b434dc5ed85c6653d2dbad0e1cb23dd56bf33b 100644 (file)
--- 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"\r
          unpack="false"/>\r
 \r
-   <plugin\r
-         id="org.apache.poi.ooxml"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.apache.poi.ooxml-schemas"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
 </feature>\r