Merge branch 'master' into develop

[taxeditor.git] / eu.etaxonomy.taxeditor.store / META-INF / MANIFEST.MF

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 126ce0a22dd50b65dc33ef2091d049bf5fcbd949..116ae09d42fd5decd686b3a89c821464880e53a5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 4.14.0.qualifier
+Bundle-Version: 5.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/bundle
@@ -17,9 +17,11 @@ Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.event,
  eu.etaxonomy.taxeditor.featuretree,
  eu.etaxonomy.taxeditor.featuretree.e4,
+ eu.etaxonomy.taxeditor.featuretree.e4.handler,
  eu.etaxonomy.taxeditor.handler,
  eu.etaxonomy.taxeditor.handler.defaultHandler,
  eu.etaxonomy.taxeditor.handler.defaultHandler.e4,
+ eu.etaxonomy.taxeditor.handler.update,
  eu.etaxonomy.taxeditor.io,
  eu.etaxonomy.taxeditor.io.wizard,
  eu.etaxonomy.taxeditor.labels,
@@ -39,6 +41,8 @@ Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.ui,
  eu.etaxonomy.taxeditor.ui.bar,
  eu.etaxonomy.taxeditor.ui.combo,
+ eu.etaxonomy.taxeditor.ui.combo.taxon,
+ eu.etaxonomy.taxeditor.ui.combo.term,
  eu.etaxonomy.taxeditor.ui.dialog,
  eu.etaxonomy.taxeditor.ui.dialog.configurator,
  eu.etaxonomy.taxeditor.ui.dialog.configurator.deleteConfigurator,
@@ -61,13 +65,12 @@ Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.view,
  eu.etaxonomy.taxeditor.view.datasource,
  eu.etaxonomy.taxeditor.view.datasource.handler,
- eu.etaxonomy.taxeditor.view.derivateSearch,
  eu.etaxonomy.taxeditor.view.detail,
  eu.etaxonomy.taxeditor.view.e4,
  eu.etaxonomy.taxeditor.view.e4.details,
  eu.etaxonomy.taxeditor.view.e4.supplementaldata,
- eu.etaxonomy.taxeditor.view.specimenSearch,
- eu.etaxonomy.taxeditor.view.supplementaldata,
+ eu.etaxonomy.taxeditor.view.search.derivative,
+ eu.etaxonomy.taxeditor.view.search.specimen,
  org.eclipse.wb.swt
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
@@ -89,7 +92,15 @@ Require-Bundle: org.eclipse.osgi,
  org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0",
  org.eclipse.e4.core.contexts;bundle-version="1.5.1",
  org.eclipse.osgi.services,
- org.eclipse.e4.core.services
+ org.eclipse.e4.core.services,
+ org.eclipse.nebula.widgets.compositetable;bundle-version="1.0.0",
+ org.eclipse.equinox.p2.repository,
+ org.eclipse.equinox.p2.ui,
+ org.eclipse.equinox.p2.operations,
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.core,
+ org.eclipse.equinox.p2.engine,
+ eu.etaxonomy.taxeditor.store
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: eu.etaxonomy.taxeditor.webapp,