From: Cherian Mathew <c.mathew@bgbm.org>
Date: Tue, 15 Sep 2015 18:38:52 +0000 (+0200)
Subject: Merge branch 'develop' into remoting-4.0
X-Git-Tag: remoting-3.10.0~1
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/ec3a353fdd8c81618684b1d665a833cb4dc46bdf

Merge branch 'develop' into remoting-4.0

Conflicts:
	eu.etaxonomy.taxeditor.cdmlib/.classpath
	eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.cdmlib/build.properties
---

ec3a353fdd8c81618684b1d665a833cb4dc46bdf
diff --cc eu.etaxonomy.taxeditor.cdmlib/.classpath
index 4477b7310,03bacd7f5..da7d39d01
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -1,201 -1,209 +1,201 @@@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<classpath>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.11.0-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.11.0-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.11.0-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.11.0-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.11.0-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.11.0-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.11.0-SNAPSHOT.jar"/>
 -	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 -	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 -	<classpathentry kind="src" path="src/main/java"/>
 -	<classpathentry kind="src" path="src/main/resources"/>
 -	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.7.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.7.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-ext-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-js-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-parser-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-script-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.8.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-codec-20041127.091804.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/doxia-core-1.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/easymock-3.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.9.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/h2-1.3.170.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-4.1.10.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-4.2.0.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-4.2.0.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.3.1.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.2.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.4.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/itextpdf-5.4.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/javassist-3.17.1-GA.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2-EA.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2-EA.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.1.3.GA.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/joda-time-2.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jtds-1.3.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/junit-4.11.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.5.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-core-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-facet-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-grouping-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-kuromoji-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-memory-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-misc-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-phonetic-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-queries-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-smartcn-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-spatial-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/lucene-stempel-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.3.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.24.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20110523.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.test-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/p6spy-1.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/paranamer-2.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/plexus-classworlds-1.2-alpha-9.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/plexus-container-default-1.0-alpha-30.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/plexus-utils-2.0.5.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/solr-core-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/solr-solrj-3.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-aop-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-beans-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-context-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-context-support-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-core-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-expression-3.2.2.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.1.3.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.1.3.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/stax-1.2.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/unitils-core-3.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/unitils-database-3.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/unitils-dbmaintainer-3.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/unitils-dbunit-3.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/unitils-easymock-3.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/unitils-inject-3.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.3.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/validation-api-1.0.0.GA.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xalan-2.6.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xmlParserAPIs-2.6.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xmlunit-1.4.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xstream-1.4.4.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>
 -	<classpathentry kind="output" path="target/classes"/>
 -</classpath>
 +<?xml version="1.0" encoding="UTF-8"?>
 +<classpath>
 +	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 +	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 +	<classpathentry kind="src" path="src/main/java"/>
 +	<classpathentry kind="src" path="src/main/resources"/>
 +	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.7.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.7.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-ext-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-js-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-parser-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-script-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.8.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-codec-20041127.091804.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/doxia-core-1.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/easymock-3.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.9.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/h2-1.3.170.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-4.1.10.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-4.2.0.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-4.2.0.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.3.1.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.2.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/itextpdf-5.4.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/javassist-3.17.1-GA.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2-EA.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2-EA.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.1.3.GA.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/joda-time-2.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jtds-1.3.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/junit-4.11.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.5.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-core-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-facet-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-grouping-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-kuromoji-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-memory-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-misc-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-phonetic-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-queries-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-smartcn-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-spatial-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/lucene-stempel-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.3.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.24.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20110523.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.test-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/p6spy-1.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/paranamer-2.3.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/plexus-classworlds-1.2-alpha-9.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/plexus-container-default-1.0-alpha-30.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/plexus-utils-2.0.5.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/solr-core-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/solr-solrj-3.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-aop-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-beans-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-context-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-context-support-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-core-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-expression-3.2.2.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.1.3.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.1.3.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/stax-1.2.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/validation-api-1.0.0.GA.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xalan-2.6.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xmlParserAPIs-2.6.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xmlunit-1.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xstream-1.4.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.10.0-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.10.0-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.10.0-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.10.0-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.10.0-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.10.0-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.10.0-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.10.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.11.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.11.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.11.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.11.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.11.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.11.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.11.0-SNAPSHOT.jar"/>
 +	<classpathentry kind="output" path="target/classes"/>
 +</classpath>
diff --cc eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 7ea3ae903,192228d8d..fe6cb9175
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@@ -657,13 -612,12 +657,13 @@@ Bundle-ClassPath: .
   lib/xmlbeans-2.3.0.jar,
   lib/poi-ooxml-schemas-3.10-FINAL.jar,
   lib/swagger-annotations-1.3.5.jar,
 + lib/apache-log4j-extras-1.2.17.jar,
-  lib/cdmlib-commons-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-ext-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-io-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-model-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-persistence-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-print-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-remote-3.10.0-SNAPSHOT.jar,
-  lib/cdmlib-services-3.10.0-SNAPSHOT.jar
+  lib/cdmlib-commons-3.11.0-SNAPSHOT.jar,
+  lib/cdmlib-ext-3.11.0-SNAPSHOT.jar,
+  lib/cdmlib-io-3.11.0-SNAPSHOT.jar,
+  lib/cdmlib-model-3.11.0-SNAPSHOT.jar,
+  lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar,
+  lib/cdmlib-print-3.11.0-SNAPSHOT.jar,
+  lib/cdmlib-remote-3.11.0-SNAPSHOT.jar,
+  lib/cdmlib-services-3.11.0-SNAPSHOT.jar
  Import-Package: eu.etaxonomy.cdm.api.application
diff --cc eu.etaxonomy.taxeditor.cdmlib/build.properties
index 3e8cb3de9,890aefc46..5622c0ecc
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@@ -184,17 -193,16 +184,18 @@@ bin.includes = META-INF/,
                 lib/poi-ooxml-3.10-FINAL.jar,\
                 lib/poi-ooxml-schemas-3.10-FINAL.jar,\
                 lib/xmlbeans-2.3.0.jar,\
-                lib/swagger-annotations-1.3.5.jar,\
-                lib/cdmlib-commons-3.10.0-SNAPSHOT.jar,\
-                lib/cdmlib-ext-3.10.0-SNAPSHOT.jar,\
-                lib/cdmlib-io-3.10.0-SNAPSHOT.jar,\
-                lib/cdmlib-model-3.10.0-SNAPSHOT.jar,\
-                lib/cdmlib-persistence-3.10.0-SNAPSHOT.jar,\
-                lib/cdmlib-print-3.10.0-SNAPSHOT.jar,\
-                lib/cdmlib-remote-3.10.0-SNAPSHOT.jar,\
-                lib/cdmlib-services-3.10.0-SNAPSHOT.jar,\
+                lib/swagger-annotations-1.3.5.jar,\
+                lib/cdmlib-commons-3.11.0-SNAPSHOT.jar,\
+                lib/cdmlib-ext-3.11.0-SNAPSHOT.jar,\
+                lib/cdmlib-io-3.11.0-SNAPSHOT.jar,\
+                lib/cdmlib-model-3.11.0-SNAPSHOT.jar,\
+                lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar,\
+                lib/cdmlib-print-3.11.0-SNAPSHOT.jar,\
+                lib/cdmlib-remote-3.11.0-SNAPSHOT.jar,\
 -               lib/cdmlib-services-3.11.0-SNAPSHOT.jar
++               lib/cdmlib-services-3.11.0-SNAPSHOT.jar,\
 +               lib/apache-log4j-extras-1.2.17.jar,\
 +               resources/cdm.map.ser
+ 
  jars.compile.order = .
  output.. = bin/
  source.. = src/main/java/,\
diff --cc pom.xml
index 4cbcd591f,81b268eb9..8e0e789e9
--- a/pom.xml
+++ b/pom.xml
@@@ -18,12 -18,11 +18,12 @@@
    <properties>
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     <cdmlib.version>3.10.0-SNAPSHOT</cdmlib.version>
+     <cdmlib.version>3.11.0-SNAPSHOT</cdmlib.version>
      <!-- TODO can we use project.version ????? -->
      <tycho.version>0.22.0</tycho.version>
-     <taxeditor.version>3.10.0-SNAPSHOT</taxeditor.version>
+     <taxeditor.version>3.11.0-SNAPSHOT</taxeditor.version>
      <update.dir>snapshot</update.dir>
 +    <unitils.version>3.4.2</unitils.version>
    </properties>
    <modules>
      <module>eu.etaxonomy.taxeditor.cdmlib</module>