merge-update 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 14a720436027d6269d3e19f34f7ce4425a506143..56e85c9b481dc4dd4642e65cc79c220938046485 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.2.3.qualifier
+Bundle-Version: 3.3.0.201401161011
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -35,6 +35,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.database.update.v25_30,
  eu.etaxonomy.cdm.database.update.v30_31,
  eu.etaxonomy.cdm.ext.bci,
+ eu.etaxonomy.cdm.ext.biocase,
  eu.etaxonomy.cdm.ext.common,
  eu.etaxonomy.cdm.ext.dc,
  eu.etaxonomy.cdm.ext.geo,
@@ -45,10 +46,6 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.hibernate.search,
  eu.etaxonomy.cdm.io.api.application,
  eu.etaxonomy.cdm.io.berlinModel,
- eu.etaxonomy.cdm.io.berlinModel.in,
- eu.etaxonomy.cdm.io.berlinModel.in.validation,
- eu.etaxonomy.cdm.io.berlinModel.out,
- eu.etaxonomy.cdm.io.berlinModel.out.mapper,
  eu.etaxonomy.cdm.io.common,
  eu.etaxonomy.cdm.io.common.events,
  eu.etaxonomy.cdm.io.common.mapping,
@@ -86,6 +83,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.model.description,
  eu.etaxonomy.cdm.model.location,
  eu.etaxonomy.cdm.model.media,
+ eu.etaxonomy.cdm.model.metadata,
  eu.etaxonomy.cdm.model.molecular,
  eu.etaxonomy.cdm.model.name,
  eu.etaxonomy.cdm.model.occurrence,
@@ -186,6 +184,7 @@ Export-Package: com.google.api,
  org.apache.commons.lang;uses:="org.apache.commons.lang.exception",
  org.apache.fop.apps,
  org.apache.http,
+ org.apache.http.client,
  org.apache.log4j;uses:="org.apache.log4j.helpers,org.apache.log4j.or,org.apache.log4j.spi",
  org.apache.log4j.chainsaw;
   uses:="org.apache.log4j,
@@ -240,15 +239,21 @@ Export-Package: com.google.api,
    org.apache.log4j.spi,
    org.w3c.dom,
    org.xml.sax",
+ org.apache.lucene.index,
+ org.apache.lucene.queryParser,
  org.apache.lucene.util,
  org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
  org.apache.xerces.dom,
  org.h2.jdbc,
+ org.hamcrest,
  org.hibernate,
  org.hibernate.annotations.common.reflection,
  org.hibernate.cache.internal,
  org.hibernate.classic,
+ org.hibernate.criterion,
+ org.hibernate.envers.query.criteria,
  org.hibernate.search,
+ org.hibernate.search.spatial.impl,
  org.jadira.usertype.dateandtime.joda,
  org.jadira.usertype.dateandtime.shared.spi,
  org.jboss.logging,
@@ -416,6 +421,22 @@ Bundle-ClassPath: .,
  lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
  lib/c3p0-0.9.2.jar,
+ lib/cdmlib-commons-3.3.0-sources.jar,
+ lib/cdmlib-commons-3.3.0.jar,
+ lib/cdmlib-ext-3.3.0-sources.jar,
+ lib/cdmlib-ext-3.3.0.jar,
+ lib/cdmlib-io-3.3.0-sources.jar,
+ lib/cdmlib-io-3.3.0.jar,
+ lib/cdmlib-model-3.3.0-sources.jar,
+ lib/cdmlib-model-3.3.0.jar,
+ lib/cdmlib-persistence-3.3.0-sources.jar,
+ lib/cdmlib-persistence-3.3.0.jar,
+ lib/cdmlib-print-3.3.0-sources.jar,
+ lib/cdmlib-print-3.3.0.jar,
+ lib/cdmlib-remote-3.3.0-sources.jar,
+ lib/cdmlib-remote-3.3.0.jar,
+ lib/cdmlib-services-3.3.0-sources.jar,
+ lib/cdmlib-services-3.3.0.jar,
  lib/cglib-nodep-2.2.2.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
@@ -578,20 +599,4 @@ Bundle-ClassPath: .,
  lib/yjp-controller-api-redist-9.0.8.jar,
  lib/google-api-translate-java-0.92.jar,
  lib/odfdom-0.8.jar,
- lib/h2mig_pagestore_addon.jar,
- lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.3.0-SNAPSHOT.jar,
- lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.3.0-SNAPSHOT.jar
+ lib/h2mig_pagestore_addon.jar