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 64465758793bb826f034c073e90b16cd3b2fb91d..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.0.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,
@@ -394,19 +399,11 @@ Require-Bundle: org.eclipse.osgi,
  org.eclipse.equinox.common
 Bundle-ClassPath: .,
  lib/activation-1.1.1.jar,
- lib/activation-1.1.jar,
- lib/antlr-2.7.6.jar,
  lib/antlr-2.7.7.jar,
  lib/aopalliance-1.0.jar,
- lib/asm-attrs.jar,
- lib/asm.jar,
- lib/aspectjrt-1.6.3.jar,
  lib/aspectjrt-1.7.1.jar,
- lib/aspectjweaver-1.6.3.jar,
  lib/aspectjweaver-1.7.1.jar,
- lib/avalon-framework-4.2.0.jar,
  lib/avro-1.6.3.jar,
- lib/batik-all-1.7.jar,
  lib/batik-anim-1.7.jar,
  lib/batik-awt-util-1.7.jar,
  lib/batik-bridge-1.7.jar,
@@ -423,45 +420,33 @@ Bundle-ClassPath: .,
  lib/batik-transcoder-1.7.jar,
  lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
- lib/c3p0-0.9.1.jar,
  lib/c3p0-0.9.2.jar,
- lib/cdmlib-commons-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-ext-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-io-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-model-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-print-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-remote-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.2.0-SNAPSHOT.jar,
- lib/cdmlib-services-3.2.0-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.2.0-SNAPSHOT.jar,
- lib/cglib-2.1.3.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,
- lib/commons-beanutils-1.8.3-sources.jar,
  lib/commons-beanutils-1.8.3.jar,
- lib/commons-codec-1.7-sources.jar,
- lib/commons-codec-1.7.jar,
  lib/commons-codec-20041127.091804.jar,
  lib/commons-collections-3.2.1.jar,
- lib/commons-collections-3.2.jar,
- lib/commons-dbcp-1.4-sources.jar,
  lib/commons-dbcp-1.4.jar,
- lib/commons-io-2.4-sources.jar,
  lib/commons-io-2.4.jar,
- lib/commons-lang-2.6-sources.jar,
  lib/commons-lang-2.6.jar,
- lib/commons-logging-1.1.1-sources.jar,
- lib/commons-logging-1.1.1.jar,
  lib/commons-logging-1.1.2.jar,
- lib/commons-pool-1.5.4-sources.jar,
  lib/commons-pool-1.5.4.jar,
  lib/concurrent-1.3.4.jar,
  lib/dbunit-2.4.9.jar,
@@ -474,44 +459,27 @@ Bundle-ClassPath: .,
  lib/dozer-5.3.0.jar,
  lib/easymock-3.1.jar,
  lib/easymockclassextension-2.3.jar,
- lib/ehcache-1.2.3.jar,
  lib/ehcache-core-2.4.3.jar,
- lib/ezmorph-1.0.6-sources.jar,
  lib/ezmorph-1.0.6.jar,
  lib/fop-1.1.jar,
- lib/fop.jar,
- lib/google-api-translate-java-0.92.jar,
  lib/guava-r05.jar,
- lib/h2-1.1.115.jar,
  lib/h2-1.3.170.jar,
  lib/hamcrest-core-1.3.jar,
  lib/hibernate-c3p0-4.1.10.Final.jar,
  lib/hibernate-cglib-repack-2.1_3.jar,
- lib/hibernate-commons-annotations-4.0.1.Final-sources.jar,
  lib/hibernate-commons-annotations-4.0.1.Final.jar,
- lib/hibernate-core-4.1.10.Final-sources.jar,
  lib/hibernate-core-4.1.10.Final.jar,
  lib/hibernate-ehcache-4.1.10.Final.jar,
  lib/hibernate-entitymanager-4.1.10.Final.jar,
- lib/hibernate-envers-4.1.10.Final-sources.jar,
  lib/hibernate-envers-4.1.10.Final.jar,
- lib/hibernate-jpa-2.0-api-1.0.1.Final-sources.jar,
  lib/hibernate-jpa-2.0-api-1.0.1.Final.jar,
  lib/hibernate-search-4.2.0.Final.jar,
  lib/hibernate-search-analyzers-4.2.0.Final.jar,
- lib/hibernate-search-engine-4.2.0.Final-sources.jar,
  lib/hibernate-search-engine-4.2.0.Final.jar,
- lib/hibernate-search-orm-4.2.0.Final-sources.jar,
  lib/hibernate-search-orm-4.2.0.Final.jar,
- lib/hibernate-tools-3.2.0.ga.jar,
- lib/hibernate-validator-4.3.1.Final-sources.jar,
  lib/hibernate-validator-4.3.1.Final.jar,
  lib/hsqldb-1.8.0.10.jar,
- lib/hsqldb.jar,
- lib/httpclient-4.2.3-sources.jar,
  lib/httpclient-4.2.3.jar,
- lib/httpcore-4.2.3-sources.jar,
- lib/httpcore-4.2.3.jar,
  lib/httpcore-4.2.4.jar,
  lib/icu4j-2.6.1.jar,
  lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,
@@ -521,42 +489,25 @@ Bundle-ClassPath: .,
  lib/jackson-mapper-asl-1.8.8.jar,
  lib/jakarta-regexp-1.4.jar,
  lib/javassist-3.17.1-GA.jar,
- lib/javassist.jar,
- lib/jaxb-api-2.1.6.jar,
  lib/jaxb-api-2.2.7.jar,
- lib/jaxb-impl-2.1.6.jar,
  lib/jaxb-impl-2.2-EA.jar,
  lib/jaxb-xjc-2.2-EA.jar,
  lib/jaxb1-impl-2.2-EA.jar,
- lib/jaxen-1.1.4-sources.jar,
  lib/jaxen-1.1.4.jar,
- lib/jboss-logging-3.1.0.GA-sources.jar,
- lib/jboss-logging-3.1.0.GA.jar,
  lib/jboss-logging-3.1.3.GA.jar,
  lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,
- lib/jdbc-1.2.jar,
- lib/jdbc2_0-stdext.jar,
  lib/jdbc4-2.0.jar,
  lib/jdom-1.1.3.jar,
- lib/jdom.jar,
- lib/joda-time-1.5.jar,
  lib/joda-time-2.1.jar,
- lib/joda-time-hibernate-1.0.jar,
- lib/json-lib-2.2.3-jdk15.jar,
  lib/json-lib-2.4-jdk15.jar,
  lib/jsr250-api-1.0.jar,
- lib/jta.jar,
- lib/jtds-1.3.0-sources.jar,
  lib/jtds-1.3.0.jar,
  lib/junit-4.11.jar,
- lib/junit-4.8.1.jar,
  lib/junit-benchmarks-0.5.0.jar,
- lib/log4j-1.2.14.jar,
  lib/log4j-1.2.17.jar,
  lib/lsid-client-1.1.2.jar,
  lib/lsid-server-1.1.2.jar,
  lib/lucene-analyzers-3.6.2.jar,
- lib/lucene-core-3.6.2-sources.jar,
  lib/lucene-core-3.6.2.jar,
  lib/lucene-facet-3.6.2.jar,
  lib/lucene-grouping-3.6.2.jar,
@@ -568,50 +519,29 @@ Bundle-ClassPath: .,
  lib/lucene-queries-3.6.2.jar,
  lib/lucene-smartcn-3.6.2.jar,
  lib/lucene-spatial-3.6.2.jar,
- lib/lucene-spellchecker-3.6.2-sources.jar,
  lib/lucene-spellchecker-3.6.2.jar,
  lib/lucene-stempel-3.6.2.jar,
- lib/mail-1.4.jar,
  lib/mchange-commons-java-0.2.3.3.jar,
- lib/mysql-connector-java-5.0.5.jar,
  lib/mysql-connector-java-5.1.24.jar,
  lib/objenesis-1.2.jar,
- lib/odfdom-0.8.jar,
  lib/odfdom-java-0.8.7.jar,
  lib/ognl-2.6.9.jar,
  lib/opencsv-2.3.jar,
- lib/org.apache.commons.codec-1.3.0.jar,
+ lib/org.eclipse.equinox.common-3.6.0.v20110523.jar,
+ lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar,
  lib/org.osgi.core-1.0.0.jar,
- lib/org.springframework.aop-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.aop-3.2.2.RELEASE.jar,
- lib/org.springframework.aspects-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.aspects-3.2.2.RELEASE.jar,
- lib/org.springframework.beans-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.beans-3.2.2.RELEASE.jar,
- lib/org.springframework.context-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.context-3.2.2.RELEASE.jar,
- lib/org.springframework.context.support-3.2.2.RELEASE-sources.jar,
- lib/org.springframework.context.support-3.2.2.RELEASE.jar,
- lib/org.springframework.core-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.core-3.2.2.RELEASE.jar,
- lib/org.springframework.expression-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.expression-3.2.2.RELEASE.jar,
- lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.jdbc-3.2.2.RELEASE.jar,
- lib/org.springframework.orm-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.orm-3.2.2.RELEASE.jar,
- lib/org.springframework.oxm-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.oxm-3.2.2.RELEASE.jar,
- lib/org.springframework.security.core-3.1.3.RELEASE-sources.jar,
- lib/org.springframework.security.core-3.1.3.RELEASE.jar,
- lib/org.springframework.security.web-3.1.1.RELEASE-sources.jar,
- lib/org.springframework.security.web-3.1.1.RELEASE.jar,
  lib/org.springframework.test-3.2.2.RELEASE.jar,
- lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.transaction-3.2.2.RELEASE.jar,
- lib/org.springframework.web-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.web-3.2.2.RELEASE.jar,
- lib/org.springframework.web.servlet-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.web.servlet-3.2.2.RELEASE.jar,
  lib/osgi-3.6.0.jar,
  lib/p6spy-1.3.jar,
@@ -619,18 +549,11 @@ 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-sources.jar,
  lib/poi-3.9.jar,
- lib/postgresql-8.2-504.jdbc4.jar,
  lib/postgresql-9.1-901.jdbc4.jar,
  lib/sanselan-0.97-incubator.jar,
- lib/saxon9he.jar,
- lib/serializer-2.7.0.jar,
- lib/servlet-2.5.0.jar,
  lib/servlet-api-2.5.jar,
- lib/slf4j-api-1.5.2.jar,
  lib/slf4j-api-1.7.2.jar,
- lib/slf4j-log4j12-1.5.2.jar,
  lib/slf4j-log4j12-1.7.2.jar,
  lib/snappy-java-1.0.4.1.jar,
  lib/solr-analysis-extras-3.6.2.jar,
@@ -643,12 +566,8 @@ Bundle-ClassPath: .,
  lib/spring-core-3.2.2.RELEASE.jar,
  lib/spring-expression-3.2.2.RELEASE.jar,
  lib/spring-modules-cache-0.7.jar,
- lib/spring-modules-lucene-0.8a.jar,
- lib/spring-security-config-3.1.1.RELEASE-sources.jar,
- lib/spring-security-config-3.1.1.RELEASE.jar,
  lib/spring-security-config-3.1.3.RELEASE.jar,
  lib/spring-security-core-3.1.3.RELEASE.jar,
- lib/spring-xml-1.5.6.jar,
  lib/stax-1.2.0.jar,
  lib/stax-api-1.0.1.jar,
  lib/unitils-core-3.3.jar,
@@ -660,35 +579,24 @@ Bundle-ClassPath: .,
  lib/unitils-mock-3.3.jar,
  lib/unitils-orm-3.3.jar,
  lib/unitils-spring-3.3.jar,
- lib/usertype.jodatime-2.0.1-sources.jar,
  lib/usertype.jodatime-2.0.1.jar,
- lib/usertype.spi-2.0.1-sources.jar,
  lib/usertype.spi-2.0.1.jar,
  lib/validation-api-1.0.0.GA.jar,
- lib/wsdl4j-1.6.2-sources.jar,
  lib/wsdl4j-1.6.2.jar,
  lib/xalan-2.6.0.jar,
- lib/xalan-2.7.0.jar,
  lib/xercesImpl-2.11.0.jar,
- lib/xercesImpl-2.7.1.jar,
- lib/xercesImpl.jar,
  lib/xml-apis-1.0.b2.jar,
- lib/xml-apis-1.3.04.jar,
  lib/xml-apis-ext-1.3.04.jar,
- lib/xml-apis.jar,
  lib/xml-resolver-1.2.jar,
- lib/xmlgraphics-commons-1.3.1.jar,
  lib/xmlgraphics-commons-1.5.jar,
  lib/xmlParserAPIs-2.6.2.jar,
  lib/xmlpull-1.1.3.1.jar,
  lib/xmlunit-1.4.jar,
  lib/xom-1.0.jar,
  lib/xpp3_min-1.1.4c.jar,
- lib/xpp3-1.1.4c-sources.jar,
  lib/xpp3-1.1.4c.jar,
- lib/xsltc.jar,
- lib/xstream-1.3.1.jar,
  lib/xstream-1.4.4.jar,
- lib/yjp-controller-api-redist-8.0.1.jar,
  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