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 20b434dc5ed85c6653d2dbad0e1cb23dd56bf33b..7e922e19e0fd88aef9080d690dc1d73d33a3e27c 100644 (file)
--- 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.\r
    </license>\r
 \r
+   <includes\r
+         id="org.apache.poi.feature"\r
+         version="0.0.0"/>\r
+\r
    <plugin\r
          id="org.simantics.excel"\r
          download-size="0"\r
@@ -114,11 +118,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"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
 </feature>\r

diff --git a/features/pom.xml b/features/pom.xml
index 6ed192931c8fd899b0e0cd45f67036bf063ccf76..6d5450ad890f103177548e1fc4ee7c0e00ea1bb4 100644 (file)
--- 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 -->\r
                   <plugin id="com.famfamfam.silk"/>\r
                   <plugin id="javax.vecmath"/>\r
-                  <plugin id="org.apache.poi.ooxml-schemas"/>\r
+                  <plugin id="org.apache.poi"/>\r
 \r
                   <plugin id="org.eclipse.core.filesystem.aix.ppc"/>\r
                   <plugin id="org.eclipse.core.filesystem.aix.ppc64"/>\r
@@ -61,6 +61,7 @@
                   <plugin id="org.eclipse.mylyn.wikitext.mediawiki.ui"/>\r
                   <plugin id="org.eclipse.mylyn.wikitext.ui"/>\r
 \r
+                  <feature id="org.apache.poi.feature"/>\r
                   <feature id="org.eclipse.ecf.core.feature"/>\r
                   <feature id="org.eclipse.ecf.core.ssl.feature"/>\r
                   <feature id="org.eclipse.ecf.filetransfer.feature"/>\r