Office (poi) extension config

features/org.jkiss.dbeaver.ext.office.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.jkiss.dbeaver.ext.office.feature"
       label="%featureName"
-      version="1.0.0"
+      version="1.1.0"
       provider-name="%providerName"
       plugin="org.jkiss.dbeaver.data.office">
 
@@ -25,28 +25,9 @@
       <import plugin="org.eclipse.jface"/>
       <import plugin="org.eclipse.ui.workbench"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.dom4j" version="1.6.1" match="greaterOrEqual"/>
-      <import plugin="org.apache.commons.codec" version="1.10.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.apache.servicemix.bundles.poi" version="3.16.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.commons.collections4" version="4.1.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.xmlbeans" version="2.6.0" match="greaterOrEqual"/>
    </requires>
 
-   <plugin
-         id="org.apache.commons.collections4"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xmlbeans"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.jkiss.dbeaver.data.office"
          download-size="0"
@@ -55,38 +36,9 @@
          unpack="false"/>
 
    <plugin
-         id="javax.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml.stream"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.codec"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.dom4j"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.servicemix.bundles.poi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+        id="org.jkiss.bundle.apache.poi"
+        download-size="0"
+        install-size="0"
+        version="0.0.0"/>
 
 </feature>

features/org.jkiss.dbeaver.ext.office.feature/pom.xml

@@ -9,7 +9,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.office.feature</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
   <packaging>eclipse-feature</packaging>
   <groupId>org.jkiss.dbeaver</groupId>
 </project>

features/org.jkiss.dbeaver.ext.oracle.feature/feature.xml

@@ -27,6 +27,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="true"/>
+         unpack="false"/>
 
 </feature>

plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Office data formats support
 Bundle-SymbolicName: org.jkiss.dbeaver.data.office;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.1.0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.jkiss.dbeaver.core,
  org.jkiss.dbeaver.model,
@@ -10,9 +10,6 @@ Require-Bundle: org.jkiss.dbeaver.core,
  org.eclipse.jface,
  org.eclipse.ui.workbench,
  org.eclipse.core.runtime,
- org.apache.xmlbeans,
- org.dom4j;bundle-version="1.6.1",
- org.apache.commons.codec;bundle-version="1.10.0",
- org.apache.servicemix.bundles.poi;bundle-version="3.16.0"
+ org.jkiss.bundle.apache.poi
 Bundle-Localization: plugin
 Bundle-ClassPath: .

plugins/org.jkiss.dbeaver.data.office/pom.xml

@@ -10,9 +10,10 @@
         <relativePath>../../</relativePath>
     </parent>
     <artifactId>org.jkiss.dbeaver.data.office</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <packaging>eclipse-plugin</packaging>
 
+<!--
     <repositories>
         <repository>
             <id>eclipse-orbit-repo</id>
@@ -20,5 +21,6 @@
             <layout>p2</layout>
         </repository>
     </repositories>
+-->
 
 </project>