merging in latest changes 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 3af41c70a28571ea44b7b78455c303856f6d9d48..9b5ebd81f9eb2586c58dbce77ec272209de189c2 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.0.6.qualifier
+Bundle-Version: 3.0.13.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -78,6 +78,7 @@ Export-Package: com.google.api,
    eu.etaxonomy.cdm.persistence.fetch,
    eu.etaxonomy.cdm.model.common",
  eu.etaxonomy.cdm.api.service.config;uses:="eu.etaxonomy.cdm.model.reference,eu.etaxonomy.cdm.model.taxon,eu.etaxonomy.cdm.persistence.query",
+ eu.etaxonomy.cdm.api.service.exception,
  eu.etaxonomy.cdm.api.service.pager,
  eu.etaxonomy.cdm.api.service.pager.impl;uses:="eu.etaxonomy.cdm.api.service.pager",
  eu.etaxonomy.cdm.api.utility;uses:="eu.etaxonomy.cdm.model.taxon,eu.etaxonomy.cdm.model.media,eu.etaxonomy.cdm.model.description",
@@ -88,6 +89,7 @@ Export-Package: com.google.api,
    eu.etaxonomy.cdm.model.common",
  eu.etaxonomy.cdm.common;uses:="org.jdom.output,org.jdom",
  eu.etaxonomy.cdm.common.media,
+ eu.etaxonomy.cdm.common.monitor,
  eu.etaxonomy.cdm.database;
   uses:="org.springframework.transaction,
    org.apache.log4j,
@@ -381,6 +383,7 @@ Export-Package: com.google.api,
    org.hibernate.type,
    org.hibernate.event,
    eu.etaxonomy.cdm.model.common",
+ eu.etaxonomy.cdm.persistence.hibernate.permission,
  eu.etaxonomy.cdm.persistence.query;uses:="org.hibernate,org.hibernate.envers.query,org.hibernate.criterion",
  eu.etaxonomy.cdm.print,
  eu.etaxonomy.cdm.print.out,
@@ -798,7 +801,6 @@ Bundle-ClassPath: .,
  lib/hibernate-annotations-3.4.0-SNAPSHOT.jar,
  lib/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar,
  lib/hibernate-core-3.4.0-SNAPSHOT.jar,
- lib/hibernate-envers-3.4.0-SNAPSHOT.jar,
  lib/hibernate-search-3.1.0.GA.jar,
  lib/hibernate-tools-3.2.0.ga.jar,
  lib/hibernate-validator-4.0.0.CR1.jar,
@@ -850,8 +852,7 @@ Bundle-ClassPath: .,
  lib/org.springframework.transaction-3.0.4.RELEASE.jar,
  lib/org.springframework.web-3.0.4.RELEASE.jar,
  lib/org.springframework.web.servlet-3.0.4.RELEASE.jar,
- lib/poi-3.1-FINAL.jar,
- lib/postgresql-8.2-504.jdbc4.jar,
+ lib/poi-3.6.jar,
  lib/sanselan-0.97-incubator.jar,
  lib/saxon9he.jar,
  lib/serializer-2.7.0.jar,
@@ -875,12 +876,22 @@ Bundle-ClassPath: .,
  lib/xom-1.0.jar,
  lib/xsltc.jar,
  lib/xstream-1.3.1.jar,
- lib/yjp-controller-api-redist-8.0.1.jar,
- lib/cdmlib-commons-3.0.8-SNAPSHOT.jar,
- lib/cdmlib-ext-3.0.8-SNAPSHOT.jar,
- lib/cdmlib-io-3.0.8-SNAPSHOT.jar,
- lib/cdmlib-model-3.0.8-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.0.8-SNAPSHOT.jar,
- lib/cdmlib-print-3.0.8-SNAPSHOT.jar,
- lib/cdmlib-remote-3.0.8-SNAPSHOT.jar,
- lib/cdmlib-services-3.0.8-SNAPSHOT.jar
+ lib/hibernate-envers-3.4.0-SNAPSHOT.jar,
+ lib/spring-xml-1.5.6.jar,
+ lib/cdmlib-commons-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-commons-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-ext-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-io-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-io-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-model-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-persistence-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-print-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-print-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-remote-3.0.13-SNAPSHOT.jar,
+ lib/cdmlib-services-3.0.13-SNAPSHOT-sources.jar,
+ lib/cdmlib-services-3.0.13-SNAPSHOT.jar,
+ lib/postgresql-9.1-901.jdbc4.jar