Release 3.6.0 merge

[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 ae9176e855516657f39f8d25162d1227acd24505..bfb4abd2c991678e4755b8caa19da2ac73568b48 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.3.7.qualifier
+Bundle-Version: 3.6.0
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -25,6 +25,8 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.api.service.statistics,
  eu.etaxonomy.cdm.api.service.util,
  eu.etaxonomy.cdm.api.utility,
+ eu.etaxonomy.cdm.api.validation,
+ eu.etaxonomy.cdm.api.validation.batch,
  eu.etaxonomy.cdm.aspectj,
  eu.etaxonomy.cdm.common,
  eu.etaxonomy.cdm.common.media,
@@ -55,6 +57,8 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.io.common.events,
  eu.etaxonomy.cdm.io.common.mapping,
  eu.etaxonomy.cdm.io.common.mapping.out,
+ eu.etaxonomy.cdm.io.csv.caryophyllales.out,
+ eu.etaxonomy.cdm.io.csv.redlist.demo,
  eu.etaxonomy.cdm.io.csv.redlist.out,
  eu.etaxonomy.cdm.io.dwca,
  eu.etaxonomy.cdm.io.dwca.in,
@@ -76,7 +80,6 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.io.specimen.abcd206.in,
  eu.etaxonomy.cdm.io.specimen.excel.in,
  eu.etaxonomy.cdm.io.taxonx,
- eu.etaxonomy.cdm.io.tcsrdf,
  eu.etaxonomy.cdm.io.tcsxml,
  eu.etaxonomy.cdm.io.tcsxml.in,
  eu.etaxonomy.cdm.io.tcsxml.out,
@@ -94,6 +97,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,
@@ -109,12 +113,15 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.persistence.dao.hibernate.occurrence,
  eu.etaxonomy.cdm.persistence.dao.hibernate.reference,
  eu.etaxonomy.cdm.persistence.dao.hibernate.taxon,
+ eu.etaxonomy.cdm.persistence.dao.hibernate.validation,
  eu.etaxonomy.cdm.persistence.dao.hibernate.view,
  eu.etaxonomy.cdm.persistence.dao.media,
  eu.etaxonomy.cdm.persistence.dao.name,
  eu.etaxonomy.cdm.persistence.dao.occurrence,
  eu.etaxonomy.cdm.persistence.dao.reference,
  eu.etaxonomy.cdm.persistence.dao.taxon,
+ eu.etaxonomy.cdm.persistence.dao.validation,
+ eu.etaxonomy.cdm.persistence.dto,
  eu.etaxonomy.cdm.persistence.fetch,
  eu.etaxonomy.cdm.persistence.hibernate,
  eu.etaxonomy.cdm.persistence.hibernate.permission,
@@ -178,6 +185,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,
@@ -187,6 +195,7 @@ Export-Package: com.google.api,
  org.apache.commons.collections;uses:="org.apache.commons.collections.keyvalue,new org.apache.commons.collections",
  org.apache.commons.io;uses:="org.apache.commons.io.filefilter",
  org.apache.commons.lang;uses:="org.apache.commons.lang.exception",
+ org.apache.commons.lang.exception,
  org.apache.fop.apps,
  org.apache.http,
  org.apache.http.client,
@@ -249,6 +258,8 @@ Export-Package: com.google.api,
  org.apache.lucene.util,
  org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
  org.apache.xerces.dom,
+ org.eclipse.osgi.internal.loader,
+ org.eclipse.osgi.util,
  org.h2.jdbc,
  org.hamcrest,
  org.hibernate,
@@ -292,6 +303,7 @@ Export-Package: com.google.api,
  org.joda.time.format;uses:="org.joda.time",
  org.joda.time.tz;uses:="org.joda.time",
  org.junit;uses:="org.hamcrest",
+ org.junit.runner,
  org.odftoolkit.odfdom,
  org.odftoolkit.odfdom.doc,
  org.odftoolkit.odfdom.doc.office,
@@ -542,7 +554,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,
@@ -594,20 +605,27 @@ Bundle-ClassPath: .,
  lib/odfdom-0.8.jar,
  lib/h2mig_pagestore_addon.jar,
  lib/spring-security-remoting-3.1.3.RELEASE.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/jena-core-2.11.2.jar,
+ lib/jena-iri-1.0.2.jar,
+ lib/cdmlib-commons--sources.jar,
+ lib/cdmlib-commons-.jar,
+ lib/cdmlib-ext--sources.jar,
+ lib/cdmlib-ext-.jar,
+ lib/cdmlib-io--sources.jar,
+ lib/cdmlib-io-.jar,
+ lib/cdmlib-model--sources.jar,
+ lib/cdmlib-model-.jar,
+ lib/cdmlib-persistence--sources.jar,
+ lib/cdmlib-persistence-.jar,
+ lib/cdmlib-print--sources.jar,
+ lib/cdmlib-print-.jar,
+ lib/cdmlib-remote--sources.jar,
+ lib/cdmlib-remote-.jar,
+ lib/cdmlib-services--sources.jar,
+ lib/cdmlib-services-.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: eu.etaxonomy.cdm.api.application