merge from trunk

[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 dcc354f5207dc7c9e055746920d219985846e8cd..7647cd210e43ff58382cfa4775404f647a09d4a8 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -200,7 +200,6 @@ Export-Package: com.google.api,
  org.apache.fop.apps,
  org.apache.http,
  org.apache.http.client,
- org.apache.http.client.methods,
  org.apache.http.util,
  org.apache.log4j;uses:="org.apache.log4j.helpers,org.apache.log4j.or,org.apache.log4j.spi",
  org.apache.log4j.chainsaw;
@@ -451,7 +450,8 @@ Export-Package: com.google.api,
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.osgi,
- org.eclipse.equinox.common
+ org.eclipse.equinox.common,
+ org.apache.commons.httpclient;bundle-version="3.1.0"
 Bundle-ClassPath: .,
  lib/activation-1.1.1.jar,
  lib/antlr-2.7.7.jar,
@@ -660,4 +660,6 @@ Bundle-ClassPath: .,
  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/poi-ooxml-schemas-3.10-FINAL.jar,
+ lib/swagger-annotations-1.3.5.jar
+Import-Package: org.apache.commons.httpclient.methods