From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 22 Nov 2016 07:16:22 +0000 (+0200)
Subject: Include org.apache.poi.feature in org.simantics.spreadsheet feature.
X-Git-Tag: v1.25.0~40
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=e0e421379d11d5af6f2b2ecdfc7db32d773e04a0

Include org.apache.poi.feature in org.simantics.spreadsheet feature.

This replaces the inclusion of only the org.apache.poi plug-in which
does not include all the dependencies required by Apache POI.

Also, exclude source org.apache.poi[.feature] source bundles from build.
Since there is no source bundle for org.apache.poi 3.15.0 so we must
exclude it from the build to get the build to pass.

refs #6813

Change-Id: Id5f388596c73f1ec58f93c884ad630e40f74d24c
---

diff --git a/features/org.simantics.spreadsheet.feature/feature.xml b/features/org.simantics.spreadsheet.feature/feature.xml
index 20b434dc5..7e922e19e 100644
--- a/features/org.simantics.spreadsheet.feature/feature.xml
+++ b/features/org.simantics.spreadsheet.feature/feature.xml
@@ -93,6 +93,10 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
    </license>
 
+   <includes
+         id="org.apache.poi.feature"
+         version="0.0.0"/>
+
    <plugin
          id="org.simantics.excel"
          download-size="0"
@@ -114,11 +118,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"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/features/pom.xml b/features/pom.xml
index 6ed192931..6d5450ad8 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -31,7 +31,7 @@
                   <!-- ID of the non-source bundle(s) to exclude from the generated source feature -->
                   <plugin id="com.famfamfam.silk"/>
                   <plugin id="javax.vecmath"/>
-                  <plugin id="org.apache.poi.ooxml-schemas"/>
+                  <plugin id="org.apache.poi"/>
 
                   <plugin id="org.eclipse.core.filesystem.aix.ppc"/>
                   <plugin id="org.eclipse.core.filesystem.aix.ppc64"/>
@@ -61,6 +61,7 @@
                   <plugin id="org.eclipse.mylyn.wikitext.mediawiki.ui"/>
                   <plugin id="org.eclipse.mylyn.wikitext.ui"/>
 
+                  <feature id="org.apache.poi.feature"/>
                   <feature id="org.eclipse.ecf.core.feature"/>
                   <feature id="org.eclipse.ecf.core.ssl.feature"/>
                   <feature id="org.eclipse.ecf.filetransfer.feature"/>