From b2d1ba65440367cbd5baadd6ab1434ba8ed1cfdb Mon Sep 17 00:00:00 2001
From: Andrey Hitrin <andrey.hitrin@redsys.ru>
Date: Mon, 5 Jun 2017 19:05:24 +0300
Subject: [PATCH] Fix dependencies for POI

---
 .../feature.xml                               |  2 --
 .../feature.xml                               | 30 ++++++++++---------
 .../META-INF/MANIFEST.MF                      |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/features/org.jkiss.dbeaver.ext.generic.feature/feature.xml b/features/org.jkiss.dbeaver.ext.generic.feature/feature.xml
index cf4f039f7b..803562524c 100644
--- a/features/org.jkiss.dbeaver.ext.generic.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.ext.generic.feature/feature.xml
@@ -35,6 +35,4 @@
     <plugin id="org.jkiss.dbeaver.ext.sqlite" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.teradata" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.vertica" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.data.office" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-
 </feature>
diff --git a/features/org.jkiss.dbeaver.ext.office.feature/feature.xml b/features/org.jkiss.dbeaver.ext.office.feature/feature.xml
index a10f955c38..08c064f534 100644
--- a/features/org.jkiss.dbeaver.ext.office.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.ext.office.feature/feature.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-        id="org.jkiss.dbeaver.ext.office.feature"
-        label="%featureName"
-        version="1.0.0"
-        plugin="org.jkiss.dbeaver.data.office">
+      id="org.jkiss.dbeaver.ext.office.feature"
+      label="%featureName"
+      version="1.0.0"
+      provider-name="%providerName"
+      plugin="org.jkiss.dbeaver.data.office">
 
-    <description>
-        %description
-    </description>
+   <description>
+      %description
+   </description>
 
-    <copyright>
-        %copyright
-    </copyright>
+   <copyright>
+      %copyright
+   </copyright>
 
-    <license url="%licenseURL">
-        %license
-    </license>
+   <license url="%licenseURL">
+      %license
+   </license>
 
    <requires>
       <import plugin="org.jkiss.dbeaver.core"/>
@@ -82,9 +83,10 @@
          unpack="false"/>
 
    <plugin
-         id="poi_bundle"
+         id="org.apache.servicemix.bundles.poi"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+
 </feature>
diff --git a/plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF
index a61b4431b8..2ea5a3108a 100644
--- a/plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF
@@ -13,6 +13,6 @@ Require-Bundle: org.jkiss.dbeaver.core,
  org.apache.xmlbeans,
  org.dom4j;bundle-version="1.6.1",
  org.apache.commons.codec;bundle-version="1.10.0",
- poi_bundle;bundle-version="1.0.0"
+ org.apache.servicemix.bundles.poi;bundle-version="3.16.0"
 Bundle-Localization: plugin
 Bundle-ClassPath: .
-- 
GitLab