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 b769f00ef896c5f8a277d70823565fcf4d53f6c5..d767f9af578403eed3ace6ea27ed64a52b087ab1 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.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -94,6 +94,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.model.occurrence,
  eu.etaxonomy.cdm.model.reference,
  eu.etaxonomy.cdm.model.taxon,
+ eu.etaxonomy.cdm.model.validation,
  eu.etaxonomy.cdm.model.view,
  eu.etaxonomy.cdm.model.view.context,
  eu.etaxonomy.cdm.persistence.dao,
@@ -177,6 +178,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.strategy.merge,
  eu.etaxonomy.cdm.strategy.parser,
  eu.etaxonomy.cdm.strategy.parser.location,
+ eu.etaxonomy.cdm.validation,
  eu.etaxonomy.cdm.validation.annotation,
  eu.etaxonomy.cdm.validation.constraint,
  eu.etaxonomy.remote.dto.rdf,
@@ -582,7 +584,6 @@ Bundle-ClassPath: .,
  lib/plexus-classworlds-1.2-alpha-9.jar,
  lib/plexus-container-default-1.0-alpha-30.jar,
  lib/plexus-utils-2.0.5.jar,
- lib/poi-3.9.jar,
  lib/postgresql-9.1-901.jdbc4.jar,
  lib/sanselan-0.97-incubator.jar,
  lib/servlet-api-2.5.jar,
@@ -636,19 +637,23 @@ 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.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.4.0-SNAPSHOT.jar,
- lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.4.0-SNAPSHOT.jar
+ lib/cdmlib-commons-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-commons-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-ext-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-io-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-io-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-model-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-model-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-persistence-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-print-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-print-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-remote-3.4.1-SNAPSHOT.jar,
+ lib/cdmlib-services-3.4.1-SNAPSHOT-sources.jar,
+ lib/cdmlib-services-3.4.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