Merge branch 'develop' into remoting-4.0

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

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 9f9e05f42cfc4d847dc561f71e077f908393e621..fe6cb91751a2759549c7133a5f497e85983b2976 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.6.1.qualifier
+Bundle-Version: 3.11.0.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -77,6 +77,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.io.sdd.ikeyplus,
  eu.etaxonomy.cdm.io.sdd.in,
  eu.etaxonomy.cdm.io.sdd.out,
+ eu.etaxonomy.cdm.io.service,
  eu.etaxonomy.cdm.io.specimen,
  eu.etaxonomy.cdm.io.specimen.abcd206.in,
  eu.etaxonomy.cdm.io.specimen.excel.in,
@@ -469,7 +470,8 @@ Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.equinox.common,
- org.apache.commons.httpclient;bundle-version="3.1.0"
+ org.apache.commons.httpclient;bundle-version="3.1.0",
+ org.eclipse.core.runtime
 Bundle-ClassPath: .,
  lib/activation-1.1.1.jar,
  lib/antlr-2.7.7.jar,
@@ -650,25 +652,18 @@ Bundle-ClassPath: .,
  lib/spring-security-remoting-3.1.3.RELEASE.jar,
  lib/jena-core-2.11.2.jar,
  lib/jena-iri-1.0.2.jar,
- lib/cdmlib-commons-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-ext-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-io-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-model-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-print-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-remote-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-services-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.6.1-SNAPSHOT.jar,
  lib/poi-3.10-FINAL.jar,
  lib/poi-ooxml-3.10-FINAL.jar,
  lib/xmlbeans-2.3.0.jar,
  lib/poi-ooxml-schemas-3.10-FINAL.jar,
- lib/swagger-annotations-1.3.5.jar
-Import-Package: org.apache.commons.httpclient.methods
+ lib/swagger-annotations-1.3.5.jar,
+ lib/apache-log4j-extras-1.2.17.jar,
+ lib/cdmlib-commons-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-io-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-model-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-print-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-services-3.11.0-SNAPSHOT.jar
+Import-Package: eu.etaxonomy.cdm.api.application