From: Patrick Plitzner
Date: Wed, 6 Jan 2016 16:03:19 +0000 (+0100)
Subject: Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
X-Git-Tag: 4.0.0^2~202
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/05a5c0f87b3270e408a66fbaad3008de145a11c8?hp=cb73af0a18cfde23c2c551ef50d56d59134e6e04
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
---
diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 3ae411e50..b7120dd43 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,21 +1,23 @@
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
+
@@ -26,176 +28,208 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
+
-
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 9886fcc20..b0c7a8345 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -186,6 +186,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.test.integration,
eu.etaxonomy.cdm.validation,
eu.etaxonomy.cdm.validation.annotation,
eu.etaxonomy.cdm.validation.constraint,
@@ -273,7 +274,7 @@ Export-Package: com.google.api,
org.w3c.dom,
org.xml.sax",
org.apache.lucene.index,
- org.apache.lucene.queryParser,
+ org.apache.lucene.queryparser.classic,
org.apache.lucene.util,
org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
org.apache.xerces.dom,
@@ -475,17 +476,21 @@ Require-Bundle: org.eclipse.osgi,
org.eclipse.core.runtime
Bundle-ClassPath: .,
lib/activation-1.1.1.jar,
+ lib/ant-1.7.0.jar,
+ lib/ant-1.9.4.jar,
+ lib/ant-launcher-1.7.0.jar,
+ lib/ant-launcher-1.9.4.jar,
lib/antlr-2.7.7.jar,
lib/aopalliance-1.0.jar,
- lib/aspectjrt-1.7.1.jar,
- lib/aspectjweaver-1.7.1.jar,
- lib/avro-1.6.3.jar,
+ lib/asm-5.0.3.jar,
+ lib/aspectjrt-1.8.7.jar,
+ lib/aspectjweaver-1.8.7.jar,
lib/batik-anim-1.7.jar,
lib/batik-awt-util-1.7.jar,
lib/batik-bridge-1.7.jar,
lib/batik-css-1.7.jar,
lib/batik-dom-1.7.jar,
- lib/batik-ext-1.7.jar,
+ lib/batik-ext-1.8.jar,
lib/batik-extension-1.7.jar,
lib/batik-gvt-1.7.jar,
lib/batik-js-1.7.jar,
@@ -496,175 +501,205 @@ Bundle-ClassPath: .,
lib/batik-transcoder-1.7.jar,
lib/batik-util-1.7.jar,
lib/batik-xml-1.7.jar,
- lib/c3p0-0.9.2.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.jar,
- lib/commons-codec-20041127.091804.jar,
- lib/commons-collections-3.2.1.jar,
+ lib/c3p0-0.9.5.2.jar,
+ lib/cdmlib-commons-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-io-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-model-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-print-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-services-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-test-3.13.0-SNAPSHOT.jar,
+ lib/cglib-3.2.0.jar,
+ lib/cglib-nodep-3.2.0.jar,
+ lib/classmate-1.3.1.jar,
+ lib/codemodel-2.2.11.jar,
+ lib/commons-beanutils-1.9.2.jar,
+ lib/commons-codec-1.10.jar,
+ lib/commons-collections-3.2.2.jar,
+ lib/commons-csv-1.0.jar,
lib/commons-dbcp-1.4.jar,
lib/commons-io-2.4.jar,
lib/commons-lang-2.6.jar,
- lib/commons-logging-1.1.2.jar,
+ lib/commons-lang3-3.3.2.jar,
+ lib/commons-logging-1.2.jar,
lib/commons-pool-1.5.4.jar,
lib/concurrent-1.3.4.jar,
lib/dbunit-2.4.9.jar,
lib/dom4j-1.6.1.jar,
- lib/doxia-core-1.3.jar,
- lib/doxia-logging-api-1.3.jar,
- lib/doxia-module-apt-1.3.jar,
- lib/doxia-module-xhtml-1.3.jar,
- lib/doxia-sink-api-1.3.jar,
+ lib/doxia-core-1.6.jar,
+ lib/doxia-logging-api-1.6.jar,
+ lib/doxia-module-apt-1.6.jar,
+ lib/doxia-module-xhtml-1.6.jar,
+ lib/doxia-sink-api-1.6.jar,
lib/dozer-5.3.0.jar,
- lib/easymock-3.1.jar,
+ lib/dtd-parser-1.1.jar,
+ lib/easymock-2.3.jar,
lib/easymockclassextension-2.3.jar,
- lib/ehcache-core-2.6.9.jar,
+ lib/ehcache-core-2.6.11.jar,
lib/ezmorph-1.0.6.jar,
+ lib/FastInfoset-1.2.13.jar,
lib/fop-1.1.jar,
- lib/guava-r05.jar,
- lib/h2-1.3.170.jar,
+ lib/guava-19.0.jar,
+ lib/h2-1.4.190.jar,
lib/hamcrest-core-1.3.jar,
- lib/hibernate-c3p0-4.1.10.Final.jar,
+ lib/hibernate-c3p0-5.0.6.Final.jar,
lib/hibernate-cglib-repack-2.1_3.jar,
- lib/hibernate-commons-annotations-4.0.1.Final.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.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.jar,
- lib/hibernate-search-orm-4.2.0.Final.jar,
- lib/hibernate-validator-4.3.1.Final.jar,
- lib/hsqldb-1.8.0.10.jar,
- lib/httpclient-4.2.3.jar,
- lib/httpcore-4.2.4.jar,
- lib/icu4j-2.6.1.jar,
- lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,
+ lib/hibernate-commons-annotations-5.0.1.Final.jar,
+ lib/hibernate-core-5.0.6.Final.jar,
+ lib/hibernate-ehcache-5.0.6.Final.jar,
+ lib/hibernate-entitymanager-5.0.6.Final.jar,
+ lib/hibernate-envers-5.0.6.Final.jar,
+ lib/hibernate-jpa-2.1-api-1.0.0.Final.jar,
+ lib/hibernate-search-engine-5.5.2.Final.jar,
+ lib/hibernate-search-orm-5.5.2.Final.jar,
+ lib/hibernate-validator-5.2.2.Final.jar,
+ lib/hibernate-validator-cdi-5.2.2.Final.jar,
+ lib/hsqldb-2.3.3.jar,
+ lib/httpclient-4.5.1.jar,
+ lib/httpclient-cache-4.2.6.jar,
+ lib/httpcore-4.4.4.jar,
+ lib/httpmime-4.5.1.jar,
lib/identificationKeyAPI-1.0-SNAPSHOT.jar,
- lib/itextpdf-5.4.0.jar,
- lib/jackson-core-asl-1.8.8.jar,
- lib/jackson-mapper-asl-1.8.8.jar,
- lib/jakarta-regexp-1.4.jar,
- lib/javassist-3.17.1-GA.jar,
- lib/jaxb-api-2.2.7.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.jar,
- lib/jboss-logging-3.1.3.GA.jar,
- lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,
+ lib/istack-commons-runtime-2.21.jar,
+ lib/istack-commons-tools-2.21.jar,
+ lib/itextpdf-5.5.8.jar,
+ lib/jackson-annotations-2.6.4.jar,
+ lib/jackson-core-2.6.4.jar,
+ lib/jackson-databind-2.6.4.jar,
+ lib/jandex-2.0.0.Final.jar,
+ lib/javassist-3.20.0-GA.jar,
+ lib/javax.el-2.2.6.jar,
+ lib/javax.el-api-2.2.5.jar,
+ lib/javax.servlet-api-3.1.0.jar,
+ lib/jaxb-api-2.2.12.jar,
+ lib/jaxb-core-2.2.11.jar,
+ lib/jaxb-jxc-2.2.11.jar,
+ lib/jaxb-runtime-2.2.11.jar,
+ lib/jaxb-xjc-2.2.11.jar,
+ lib/jaxen-1.1.6.jar,
+ lib/jboss-logging-3.3.0.Final.jar,
+ lib/jcl-over-slf4j-1.7.6.jar,
lib/jdbc4-2.0.jar,
lib/jdom-1.1.3.jar,
- lib/joda-time-2.1.jar,
+ lib/jdom2-2.0.6.jar,
+ lib/jena-arq-2.13.0.jar,
+ lib/jena-core-2.13.0.jar,
+ lib/jena-iri-1.1.2.jar,
+ lib/jena-tdb-1.1.2.jar,
+ lib/joda-time-2.9.1.jar,
+ lib/json-20090211.jar,
lib/json-lib-2.4-jdk15.jar,
+ lib/jsonld-java-0.5.1.jar,
lib/jsr250-api-1.0.jar,
- lib/jtds-1.3.0.jar,
- lib/junit-4.11.jar,
- lib/junit-benchmarks-0.5.0.jar,
+ lib/jta-1.1.jar,
+ lib/jtds-1.3.1.jar,
+ lib/junit-4.12.jar,
+ lib/junit-benchmarks-0.7.2.jar,
+ lib/libthrift-0.9.2.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.jar,
- lib/lucene-facet-3.6.2.jar,
- lib/lucene-grouping-3.6.2.jar,
- lib/lucene-highlighter-3.6.2.jar,
- lib/lucene-kuromoji-3.6.2.jar,
- lib/lucene-memory-3.6.2.jar,
- lib/lucene-misc-3.6.2.jar,
- lib/lucene-phonetic-3.6.2.jar,
- 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.jar,
- lib/lucene-stempel-3.6.2.jar,
- lib/mchange-commons-java-0.2.3.3.jar,
- lib/mysql-connector-java-5.1.24.jar,
- lib/objenesis-1.2.jar,
+ lib/lucene-analyzers-common-5.4.0.jar,
+ lib/lucene-backward-codecs-5.4.0.jar,
+ lib/lucene-core-5.4.0.jar,
+ lib/lucene-facet-5.4.0.jar,
+ lib/lucene-grouping-5.4.0.jar,
+ lib/lucene-highlighter-5.4.0.jar,
+ lib/lucene-join-5.4.0.jar,
+ lib/lucene-memory-5.4.0.jar,
+ lib/lucene-misc-5.4.0.jar,
+ lib/lucene-queries-5.4.0.jar,
+ lib/lucene-queryparser-5.4.0.jar,
+ lib/lucene-sandbox-5.4.0.jar,
+ lib/lucene-suggest-5.4.0.jar,
+ lib/mapstruct-1.0.0.Final.jar,
+ lib/mchange-commons-java-0.2.11.jar,
+ lib/mysql-connector-java-5.1.38.jar,
lib/odfdom-java-0.8.7.jar,
lib/ognl-2.6.9.jar,
lib/opencsv-2.3.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.jar,
- lib/org.springframework.aspects-3.2.2.RELEASE.jar,
- lib/org.springframework.beans-3.2.2.RELEASE.jar,
- lib/org.springframework.context-3.2.2.RELEASE.jar,
- lib/org.springframework.core-3.2.2.RELEASE.jar,
- lib/org.springframework.expression-3.2.2.RELEASE.jar,
- lib/org.springframework.jdbc-3.2.2.RELEASE.jar,
- lib/org.springframework.orm-3.2.2.RELEASE.jar,
- lib/org.springframework.oxm-3.2.2.RELEASE.jar,
- lib/org.springframework.test-3.2.2.RELEASE.jar,
- lib/org.springframework.transaction-3.2.2.RELEASE.jar,
- lib/org.springframework.web-3.2.2.RELEASE.jar,
- lib/org.springframework.web.servlet-3.2.2.RELEASE.jar,
lib/osgi-3.6.0.jar,
- lib/p6spy-1.3.jar,
- lib/paranamer-2.3.jar,
+ lib/p6spy-2.1.3.jar,
lib/plexus-classworlds-1.2-alpha-9.jar,
+ lib/plexus-component-annotations-1.5.5.jar,
lib/plexus-container-default-1.0-alpha-30.jar,
- lib/plexus-utils-2.0.5.jar,
- lib/postgresql-9.1-901.jdbc4.jar,
+ lib/plexus-utils-3.0.15.jar,
+ lib/poi-3.13.jar,
+ lib/poi-ooxml-3.13.jar,
+ lib/poi-ooxml-schemas-3.13.jar,
+ lib/postgresql-9.4-1205-jdbc42.jar,
+ lib/relaxngDatatype-20020414.jar,
+ lib/rngom-2.2.11.jar,
lib/sanselan-0.97-incubator.jar,
- lib/servlet-api-2.5.jar,
- lib/slf4j-api-1.7.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,
- lib/solr-core-3.6.2.jar,
- lib/solr-solrj-3.6.2.jar,
- lib/spring-aop-3.2.2.RELEASE.jar,
- lib/spring-beans-3.2.2.RELEASE.jar,
- lib/spring-context-3.2.2.RELEASE.jar,
- lib/spring-context-support-3.2.2.RELEASE.jar,
- lib/spring-core-3.2.2.RELEASE.jar,
- lib/spring-expression-3.2.2.RELEASE.jar,
+ lib/Saxon-HE-9.7.0-1.jar,
+ lib/slf4j-api-1.7.13.jar,
+ lib/slf4j-log4j12-1.7.13.jar,
+ lib/slf4j-nop-1.7.13.jar,
+ lib/spring-aop-4.2.4.RELEASE.jar,
+ lib/spring-aspects-4.2.4.RELEASE.jar,
+ lib/spring-beans-4.2.4.RELEASE.jar,
+ lib/spring-context-4.2.4.RELEASE.jar,
+ lib/spring-context-support-4.2.4.RELEASE.jar,
+ lib/spring-core-4.2.4.RELEASE.jar,
+ lib/spring-expression-4.2.4.RELEASE.jar,
+ lib/spring-jdbc-4.2.4.RELEASE.jar,
lib/spring-modules-cache-0.7.jar,
- lib/spring-security-config-3.1.3.RELEASE.jar,
- lib/spring-security-core-3.1.3.RELEASE.jar,
+ lib/spring-orm-4.2.4.RELEASE.jar,
+ lib/spring-oxm-4.2.4.RELEASE.jar,
+ lib/spring-plugin-core-1.2.0.RELEASE.jar,
+ lib/spring-plugin-metadata-1.2.0.RELEASE.jar,
+ lib/spring-security-config-4.0.3.RELEASE.jar,
+ lib/spring-security-core-4.0.3.RELEASE.jar,
+ lib/spring-security-web-4.0.3.RELEASE.jar,
+ lib/spring-test-4.2.4.RELEASE.jar,
+ lib/spring-tx-4.2.4.RELEASE.jar,
+ lib/spring-web-4.2.4.RELEASE.jar,
+ lib/spring-webmvc-4.2.4.RELEASE.jar,
+ lib/springfox-core-2.3.1.jar,
+ lib/springfox-schema-2.3.1.jar,
+ lib/springfox-spi-2.3.1.jar,
+ lib/springfox-spring-web-2.3.1.jar,
+ lib/springfox-swagger-common-2.3.1.jar,
+ lib/springfox-swagger2-2.3.1.jar,
+ lib/standard-1.1.2.jar,
lib/stax-1.2.0.jar,
lib/stax-api-1.0.1.jar,
+ lib/stax-ex-1.7.7.jar,
+ lib/swagger-annotations-1.5.5.jar,
+ lib/swagger-models-1.5.5.jar,
+ lib/tools.jar,
+ lib/txw2-2.2.11.jar,
+ lib/unitils-core-3.4.2.jar,
+ lib/unitils-database-3.4.2.jar,
+ lib/unitils-dbmaintainer-3.4.2.jar,
+ lib/unitils-dbunit-3.4.2.jar,
+ lib/unitils-easymock-3.4.2.jar,
+ lib/unitils-inject-3.4.2.jar,
+ lib/unitils-mock-3.4.2.jar,
+ lib/unitils-orm-3.4.2.jar,
+ lib/unitils-spring-3.4.2.jar,
lib/usertype.jodatime-2.0.1.jar,
lib/usertype.spi-2.0.1.jar,
- lib/validation-api-1.0.0.GA.jar,
- lib/wsdl4j-1.6.2.jar,
- lib/xalan-2.6.0.jar,
+ lib/validation-api-1.1.0.Final.jar,
+ lib/wsdl4j-1.6.3.jar,
+ lib/xalan-2.7.0.jar,
lib/xercesImpl-2.11.0.jar,
lib/xml-apis-1.0.b2.jar,
lib/xml-apis-ext-1.3.04.jar,
lib/xml-resolver-1.2.jar,
+ lib/xmlbeans-2.6.0.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/xmlunit-1.6.jar,
+ lib/xom-1.2.5.jar,
lib/xpp3_min-1.1.4c.jar,
lib/xpp3-1.1.4c.jar,
- lib/xstream-1.4.4.jar,
+ lib/xsom-20140925.jar,
+ lib/xstream-1.4.8.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,
- lib/spring-security-remoting-3.1.3.RELEASE.jar,
- lib/jena-core-2.11.2.jar,
- lib/jena-iri-1.0.2.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,
- lib/apache-log4j-extras-1.2.17.jar,
- lib/cdmlib-commons-3.13.0-SNAPSHOT.jar,
- lib/cdmlib-ext-3.13.0-SNAPSHOT.jar,
- lib/cdmlib-io-3.13.0-SNAPSHOT.jar,
- lib/cdmlib-model-3.13.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar,
- lib/cdmlib-print-3.13.0-SNAPSHOT.jar,
- lib/cdmlib-remote-3.13.0-SNAPSHOT.jar,
- lib/cdmlib-services-3.13.0-SNAPSHOT.jar
+ lib/odfdom-0.8.jar
Import-Package: eu.etaxonomy.cdm.api.application
diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 0733011eb..ab118d641 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -1,17 +1,23 @@
bin.includes = META-INF/,\
.,\
+ lib/spring-security-remoting-3.1.3.RELEASE.jar,\
+ resources/cdm.map.ser,\
lib/activation-1.1.1.jar,\
+ lib/ant-1.7.0.jar,\
+ lib/ant-1.9.4.jar,\
+ lib/ant-launcher-1.7.0.jar,\
+ lib/ant-launcher-1.9.4.jar,\
lib/antlr-2.7.7.jar,\
lib/aopalliance-1.0.jar,\
- lib/aspectjrt-1.7.1.jar,\
- lib/aspectjweaver-1.7.1.jar,\
- lib/avro-1.6.3.jar,\
+ lib/asm-5.0.3.jar,\
+ lib/aspectjrt-1.8.7.jar,\
+ lib/aspectjweaver-1.8.7.jar,\
lib/batik-anim-1.7.jar,\
lib/batik-awt-util-1.7.jar,\
lib/batik-bridge-1.7.jar,\
lib/batik-css-1.7.jar,\
lib/batik-dom-1.7.jar,\
- lib/batik-ext-1.7.jar,\
+ lib/batik-ext-1.8.jar,\
lib/batik-extension-1.7.jar,\
lib/batik-gvt-1.7.jar,\
lib/batik-js-1.7.jar,\
@@ -22,179 +28,207 @@ bin.includes = META-INF/,\
lib/batik-transcoder-1.7.jar,\
lib/batik-util-1.7.jar,\
lib/batik-xml-1.7.jar,\
- lib/c3p0-0.9.2.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.jar,\
- lib/commons-codec-20041127.091804.jar,\
- lib/commons-collections-3.2.1.jar,\
+ lib/c3p0-0.9.5.2.jar,\
+ lib/cdmlib-commons-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-ext-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-io-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-model-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-print-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-remote-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-services-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-test-3.13.0-SNAPSHOT.jar,\
+ lib/cglib-3.2.0.jar,\
+ lib/cglib-nodep-3.2.0.jar,\
+ lib/classmate-1.3.1.jar,\
+ lib/codemodel-2.2.11.jar,\
+ lib/commons-beanutils-1.9.2.jar,\
+ lib/commons-codec-1.10.jar,\
+ lib/commons-collections-3.2.2.jar,\
+ lib/commons-csv-1.0.jar,\
lib/commons-dbcp-1.4.jar,\
lib/commons-io-2.4.jar,\
lib/commons-lang-2.6.jar,\
- lib/commons-logging-1.1.2.jar,\
+ lib/commons-lang3-3.3.2.jar,\
+ lib/commons-logging-1.2.jar,\
lib/commons-pool-1.5.4.jar,\
lib/concurrent-1.3.4.jar,\
lib/dbunit-2.4.9.jar,\
lib/dom4j-1.6.1.jar,\
- lib/doxia-core-1.3.jar,\
- lib/doxia-logging-api-1.3.jar,\
- lib/doxia-module-apt-1.3.jar,\
- lib/doxia-module-xhtml-1.3.jar,\
- lib/doxia-sink-api-1.3.jar,\
+ lib/doxia-core-1.6.jar,\
+ lib/doxia-logging-api-1.6.jar,\
+ lib/doxia-module-apt-1.6.jar,\
+ lib/doxia-module-xhtml-1.6.jar,\
+ lib/doxia-sink-api-1.6.jar,\
lib/dozer-5.3.0.jar,\
- lib/easymock-3.1.jar,\
+ lib/dtd-parser-1.1.jar,\
+ lib/easymock-2.3.jar,\
lib/easymockclassextension-2.3.jar,\
- lib/ehcache-core-2.6.9.jar,\
+ lib/ehcache-core-2.6.11.jar,\
lib/ezmorph-1.0.6.jar,\
+ lib/FastInfoset-1.2.13.jar,\
lib/fop-1.1.jar,\
- lib/guava-r05.jar,\
- lib/h2-1.3.170.jar,\
+ lib/guava-19.0.jar,\
+ lib/h2-1.4.190.jar,\
lib/hamcrest-core-1.3.jar,\
- lib/hibernate-c3p0-4.1.10.Final.jar,\
+ lib/hibernate-c3p0-5.0.6.Final.jar,\
lib/hibernate-cglib-repack-2.1_3.jar,\
- lib/hibernate-commons-annotations-4.0.1.Final.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.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.jar,\
- lib/hibernate-search-orm-4.2.0.Final.jar,\
- lib/hibernate-validator-4.3.1.Final.jar,\
- lib/hsqldb-1.8.0.10.jar,\
- lib/httpclient-4.2.3.jar,\
- lib/httpcore-4.2.4.jar,\
- lib/icu4j-2.6.1.jar,\
- lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,\
+ lib/hibernate-commons-annotations-5.0.1.Final.jar,\
+ lib/hibernate-core-5.0.6.Final.jar,\
+ lib/hibernate-ehcache-5.0.6.Final.jar,\
+ lib/hibernate-entitymanager-5.0.6.Final.jar,\
+ lib/hibernate-envers-5.0.6.Final.jar,\
+ lib/hibernate-jpa-2.1-api-1.0.0.Final.jar,\
+ lib/hibernate-search-engine-5.5.2.Final.jar,\
+ lib/hibernate-search-orm-5.5.2.Final.jar,\
+ lib/hibernate-validator-5.2.2.Final.jar,\
+ lib/hibernate-validator-cdi-5.2.2.Final.jar,\
+ lib/hsqldb-2.3.3.jar,\
+ lib/httpclient-4.5.1.jar,\
+ lib/httpclient-cache-4.2.6.jar,\
+ lib/httpcore-4.4.4.jar,\
+ lib/httpmime-4.5.1.jar,\
lib/identificationKeyAPI-1.0-SNAPSHOT.jar,\
- lib/itextpdf-5.4.0.jar,\
- lib/jackson-core-asl-1.8.8.jar,\
- lib/jackson-mapper-asl-1.8.8.jar,\
- lib/jakarta-regexp-1.4.jar,\
- lib/javassist-3.17.1-GA.jar,\
- lib/jaxb-api-2.2.7.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.jar,\
- lib/jboss-logging-3.1.3.GA.jar,\
- lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,\
+ lib/istack-commons-runtime-2.21.jar,\
+ lib/istack-commons-tools-2.21.jar,\
+ lib/itextpdf-5.5.8.jar,\
+ lib/jackson-annotations-2.6.4.jar,\
+ lib/jackson-core-2.6.4.jar,\
+ lib/jackson-databind-2.6.4.jar,\
+ lib/jandex-2.0.0.Final.jar,\
+ lib/javassist-3.20.0-GA.jar,\
+ lib/javax.el-2.2.6.jar,\
+ lib/javax.el-api-2.2.5.jar,\
+ lib/javax.servlet-api-3.1.0.jar,\
+ lib/jaxb-api-2.2.12.jar,\
+ lib/jaxb-core-2.2.11.jar,\
+ lib/jaxb-jxc-2.2.11.jar,\
+ lib/jaxb-runtime-2.2.11.jar,\
+ lib/jaxb-xjc-2.2.11.jar,\
+ lib/jaxen-1.1.6.jar,\
+ lib/jboss-logging-3.3.0.Final.jar,\
+ lib/jcl-over-slf4j-1.7.6.jar,\
lib/jdbc4-2.0.jar,\
lib/jdom-1.1.3.jar,\
- lib/joda-time-2.1.jar,\
+ lib/jdom2-2.0.6.jar,\
+ lib/jena-arq-2.13.0.jar,\
+ lib/jena-core-2.13.0.jar,\
+ lib/jena-iri-1.1.2.jar,\
+ lib/jena-tdb-1.1.2.jar,\
+ lib/joda-time-2.9.1.jar,\
+ lib/json-20090211.jar,\
lib/json-lib-2.4-jdk15.jar,\
+ lib/jsonld-java-0.5.1.jar,\
lib/jsr250-api-1.0.jar,\
- lib/jtds-1.3.0.jar,\
- lib/junit-4.11.jar,\
- lib/junit-benchmarks-0.5.0.jar,\
+ lib/jta-1.1.jar,\
+ lib/jtds-1.3.1.jar,\
+ lib/junit-4.12.jar,\
+ lib/junit-benchmarks-0.7.2.jar,\
+ lib/libthrift-0.9.2.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.jar,\
- lib/lucene-facet-3.6.2.jar,\
- lib/lucene-grouping-3.6.2.jar,\
- lib/lucene-highlighter-3.6.2.jar,\
- lib/lucene-kuromoji-3.6.2.jar,\
- lib/lucene-memory-3.6.2.jar,\
- lib/lucene-misc-3.6.2.jar,\
- lib/lucene-phonetic-3.6.2.jar,\
- 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.jar,\
- lib/lucene-stempel-3.6.2.jar,\
- lib/mchange-commons-java-0.2.3.3.jar,\
- lib/mysql-connector-java-5.1.24.jar,\
- lib/objenesis-1.2.jar,\
+ lib/lucene-analyzers-common-5.4.0.jar,\
+ lib/lucene-backward-codecs-5.4.0.jar,\
+ lib/lucene-core-5.4.0.jar,\
+ lib/lucene-facet-5.4.0.jar,\
+ lib/lucene-grouping-5.4.0.jar,\
+ lib/lucene-highlighter-5.4.0.jar,\
+ lib/lucene-join-5.4.0.jar,\
+ lib/lucene-memory-5.4.0.jar,\
+ lib/lucene-misc-5.4.0.jar,\
+ lib/lucene-queries-5.4.0.jar,\
+ lib/lucene-queryparser-5.4.0.jar,\
+ lib/lucene-sandbox-5.4.0.jar,\
+ lib/lucene-suggest-5.4.0.jar,\
+ lib/mapstruct-1.0.0.Final.jar,\
+ lib/mchange-commons-java-0.2.11.jar,\
+ lib/mysql-connector-java-5.1.38.jar,\
lib/odfdom-java-0.8.7.jar,\
lib/ognl-2.6.9.jar,\
lib/opencsv-2.3.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.jar,\
- lib/org.springframework.aspects-3.2.2.RELEASE.jar,\
- lib/org.springframework.beans-3.2.2.RELEASE.jar,\
- lib/org.springframework.context-3.2.2.RELEASE.jar,\
- lib/org.springframework.core-3.2.2.RELEASE.jar,\
- lib/org.springframework.expression-3.2.2.RELEASE.jar,\
- lib/org.springframework.jdbc-3.2.2.RELEASE.jar,\
- lib/org.springframework.orm-3.2.2.RELEASE.jar,\
- lib/org.springframework.oxm-3.2.2.RELEASE.jar,\
- lib/org.springframework.test-3.2.2.RELEASE.jar,\
- lib/org.springframework.transaction-3.2.2.RELEASE.jar,\
- lib/org.springframework.web-3.2.2.RELEASE.jar,\
- lib/org.springframework.web.servlet-3.2.2.RELEASE.jar,\
lib/osgi-3.6.0.jar,\
- lib/p6spy-1.3.jar,\
- lib/paranamer-2.3.jar,\
+ lib/p6spy-2.1.3.jar,\
lib/plexus-classworlds-1.2-alpha-9.jar,\
+ lib/plexus-component-annotations-1.5.5.jar,\
lib/plexus-container-default-1.0-alpha-30.jar,\
- lib/plexus-utils-2.0.5.jar,\
- lib/postgresql-9.1-901.jdbc4.jar,\
+ lib/plexus-utils-3.0.15.jar,\
+ lib/poi-3.13.jar,\
+ lib/poi-ooxml-3.13.jar,\
+ lib/poi-ooxml-schemas-3.13.jar,\
+ lib/postgresql-9.4-1205-jdbc42.jar,\
+ lib/relaxngDatatype-20020414.jar,\
+ lib/rngom-2.2.11.jar,\
lib/sanselan-0.97-incubator.jar,\
- lib/servlet-api-2.5.jar,\
- lib/slf4j-api-1.7.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,\
- lib/solr-core-3.6.2.jar,\
- lib/solr-solrj-3.6.2.jar,\
- lib/spring-aop-3.2.2.RELEASE.jar,\
- lib/spring-beans-3.2.2.RELEASE.jar,\
- lib/spring-context-3.2.2.RELEASE.jar,\
- lib/spring-context-support-3.2.2.RELEASE.jar,\
- lib/spring-core-3.2.2.RELEASE.jar,\
- lib/spring-expression-3.2.2.RELEASE.jar,\
+ lib/Saxon-HE-9.7.0-1.jar,\
+ lib/slf4j-api-1.7.13.jar,\
+ lib/slf4j-log4j12-1.7.13.jar,\
+ lib/slf4j-nop-1.7.13.jar,\
+ lib/spring-aop-4.2.4.RELEASE.jar,\
+ lib/spring-aspects-4.2.4.RELEASE.jar,\
+ lib/spring-beans-4.2.4.RELEASE.jar,\
+ lib/spring-context-4.2.4.RELEASE.jar,\
+ lib/spring-context-support-4.2.4.RELEASE.jar,\
+ lib/spring-core-4.2.4.RELEASE.jar,\
+ lib/spring-expression-4.2.4.RELEASE.jar,\
+ lib/spring-jdbc-4.2.4.RELEASE.jar,\
lib/spring-modules-cache-0.7.jar,\
- lib/spring-security-config-3.1.3.RELEASE.jar,\
- lib/spring-security-core-3.1.3.RELEASE.jar,\
+ lib/spring-orm-4.2.4.RELEASE.jar,\
+ lib/spring-oxm-4.2.4.RELEASE.jar,\
+ lib/spring-plugin-core-1.2.0.RELEASE.jar,\
+ lib/spring-plugin-metadata-1.2.0.RELEASE.jar,\
+ lib/spring-security-config-4.0.3.RELEASE.jar,\
+ lib/spring-security-core-4.0.3.RELEASE.jar,\
+ lib/spring-security-web-4.0.3.RELEASE.jar,\
+ lib/spring-test-4.2.4.RELEASE.jar,\
+ lib/spring-tx-4.2.4.RELEASE.jar,\
+ lib/spring-web-4.2.4.RELEASE.jar,\
+ lib/spring-webmvc-4.2.4.RELEASE.jar,\
+ lib/springfox-core-2.3.1.jar,\
+ lib/springfox-schema-2.3.1.jar,\
+ lib/springfox-spi-2.3.1.jar,\
+ lib/springfox-spring-web-2.3.1.jar,\
+ lib/springfox-swagger-common-2.3.1.jar,\
+ lib/springfox-swagger2-2.3.1.jar,\
+ lib/standard-1.1.2.jar,\
lib/stax-1.2.0.jar,\
lib/stax-api-1.0.1.jar,\
+ lib/stax-ex-1.7.7.jar,\
+ lib/swagger-annotations-1.5.5.jar,\
+ lib/swagger-models-1.5.5.jar,\
+ lib/tools.jar,\
+ lib/txw2-2.2.11.jar,\
+ lib/unitils-core-3.4.2.jar,\
+ lib/unitils-database-3.4.2.jar,\
+ lib/unitils-dbmaintainer-3.4.2.jar,\
+ lib/unitils-dbunit-3.4.2.jar,\
+ lib/unitils-easymock-3.4.2.jar,\
+ lib/unitils-inject-3.4.2.jar,\
+ lib/unitils-mock-3.4.2.jar,\
+ lib/unitils-orm-3.4.2.jar,\
+ lib/unitils-spring-3.4.2.jar,\
lib/usertype.jodatime-2.0.1.jar,\
lib/usertype.spi-2.0.1.jar,\
- lib/validation-api-1.0.0.GA.jar,\
- lib/wsdl4j-1.6.2.jar,\
- lib/xalan-2.6.0.jar,\
+ lib/validation-api-1.1.0.Final.jar,\
+ lib/wsdl4j-1.6.3.jar,\
+ lib/xalan-2.7.0.jar,\
lib/xercesImpl-2.11.0.jar,\
lib/xml-apis-1.0.b2.jar,\
lib/xml-apis-ext-1.3.04.jar,\
lib/xml-resolver-1.2.jar,\
+ lib/xmlbeans-2.6.0.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/xmlunit-1.6.jar,\
+ lib/xom-1.2.5.jar,\
lib/xpp3_min-1.1.4c.jar,\
lib/xpp3-1.1.4c.jar,\
- lib/xstream-1.4.4.jar,\
+ lib/xsom-20140925.jar,\
+ lib/xstream-1.4.8.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,\
- lib/spring-security-remoting-3.1.3.RELEASE.jar,\
- lib/spring-security-remoting-3.1.3.RELEASE.jar,\
- lib/jena-core-2.11.2.jar,\
- lib/jena-iri-1.0.2.jar,\
- lib/poi-3.10-FINAL.jar,\
- 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.13.0-SNAPSHOT.jar,\
- lib/cdmlib-ext-3.13.0-SNAPSHOT.jar,\
- lib/cdmlib-io-3.13.0-SNAPSHOT.jar,\
- lib/cdmlib-model-3.13.0-SNAPSHOT.jar,\
- lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar,\
- lib/cdmlib-print-3.13.0-SNAPSHOT.jar,\
- lib/cdmlib-remote-3.13.0-SNAPSHOT.jar,\
- lib/cdmlib-services-3.13.0-SNAPSHOT.jar,\
- lib/apache-log4j-extras-1.2.17.jar,\
- resources/cdm.map.ser
+ lib/odfdom-0.8.jar
jars.compile.order = .
output.. = bin/
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/FastInfoset-1.2.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/FastInfoset-1.2.13.jar
new file mode 100644
index 000000000..933e4eeac
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/FastInfoset-1.2.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar
new file mode 100644
index 000000000..28045859a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/Saxon-HE-9.7.0-1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ant-1.7.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ant-1.7.0.jar
new file mode 100644
index 000000000..0a56a58f9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/ant-1.7.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ant-1.9.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ant-1.9.4.jar
new file mode 100644
index 000000000..24641e74a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/ant-1.9.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ant-launcher-1.7.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ant-launcher-1.7.0.jar
new file mode 100644
index 000000000..12a1e78d0
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/ant-launcher-1.7.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ant-launcher-1.9.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ant-launcher-1.9.4.jar
new file mode 100644
index 000000000..97c2262be
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/ant-launcher-1.9.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/apache-log4j-extras-1.2.17.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/apache-log4j-extras-1.2.17.jar
deleted file mode 100644
index b08d8d56e..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/apache-log4j-extras-1.2.17.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/asm-5.0.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/asm-5.0.3.jar
new file mode 100644
index 000000000..573535b1d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/asm-5.0.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar
deleted file mode 100644
index 351409c83..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar
new file mode 100644
index 000000000..26dcea2dd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.8.7.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar
deleted file mode 100644
index 9949bc528..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar
new file mode 100644
index 000000000..ca1829a58
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.8.7.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/avro-1.6.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/avro-1.6.3.jar
deleted file mode 100644
index eef37ce62..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/avro-1.6.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.7.jar
deleted file mode 100644
index 57fb27327..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.7.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.8.jar
new file mode 100644
index 000000000..6a09ca364
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.8.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar
deleted file mode 100644
index 5dea94b48..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar
new file mode 100644
index 000000000..579cedd98
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.5.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar
new file mode 100644
index 000000000..51e2d8512
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar
deleted file mode 100644
index 02d81e880..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar
new file mode 100644
index 000000000..e11f7cb6b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/classmate-1.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/classmate-1.3.1.jar
new file mode 100644
index 000000000..01bf55b92
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/classmate-1.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/codemodel-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/codemodel-2.2.11.jar
new file mode 100644
index 000000000..02f3da463
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/codemodel-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/com.springsource.org.aopalliance-1.0.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/com.springsource.org.aopalliance-1.0.0.jar
deleted file mode 100644
index 3c5cf8bfb..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/com.springsource.org.aopalliance-1.0.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/com.springsource.org.apache.commons.logging-1.1.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/com.springsource.org.apache.commons.logging-1.1.1.jar
deleted file mode 100644
index f50c78cce..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/com.springsource.org.apache.commons.logging-1.1.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3.jar
deleted file mode 100644
index 218510bc5..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.9.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.9.2.jar
new file mode 100644
index 000000000..7d075edf4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.9.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar
new file mode 100644
index 000000000..1d7417c40
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.10.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar
deleted file mode 100644
index 0df1030ea..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar
deleted file mode 100644
index c35fa1fee..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.2.jar
new file mode 100644
index 000000000..fa5df82a6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-csv-1.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-csv-1.0.jar
new file mode 100644
index 000000000..5f58e4016
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-csv-1.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar
new file mode 100644
index 000000000..2ce08ae99
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang3-3.3.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar
deleted file mode 100644
index d6a543c4e..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.2.jar
new file mode 100644
index 000000000..93a3b9f6d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.3.jar
deleted file mode 100644
index 9f8fb36e5..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar
new file mode 100644
index 000000000..4f595c65f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.3.jar
deleted file mode 100644
index 59e009b26..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar
new file mode 100644
index 000000000..aa3d9095d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.3.jar
deleted file mode 100644
index ae4f3c64a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar
new file mode 100644
index 000000000..90803483a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.3.jar
deleted file mode 100644
index b888a407a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar
new file mode 100644
index 000000000..ca6607eb0
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar
similarity index 61%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.3.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar
index 10ca4b67f..7ddd397d3 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.3.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/dtd-parser-1.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/dtd-parser-1.1.jar
new file mode 100644
index 000000000..e6e6c4e40
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/dtd-parser-1.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-2.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-2.3.jar
new file mode 100644
index 000000000..190213e35
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-2.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar
deleted file mode 100644
index 4b79dd1a8..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.11.jar
similarity index 79%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.11.jar
index 99dd2d26e..0eb926ba4 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/guava-19.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/guava-19.0.jar
new file mode 100644
index 000000000..b175ca867
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/guava-19.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/guava-r05.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/guava-r05.jar
deleted file mode 100644
index 0407b9c01..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/guava-r05.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.jar
deleted file mode 100644
index 869798e48..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.4.190.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.4.190.jar
new file mode 100644
index 000000000..8b11e2e82
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.4.190.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/h2mig_pagestore_addon.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/h2mig_pagestore_addon.jar
deleted file mode 100644
index 51548b4cf..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/h2mig_pagestore_addon.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar
deleted file mode 100644
index 7eb1a03c8..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar
new file mode 100644
index 000000000..f3fedee40
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final.jar
deleted file mode 100644
index ac9d6741d..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-5.0.1.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-5.0.1.Final.jar
new file mode 100644
index 000000000..82e425dc2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-5.0.1.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final.jar
deleted file mode 100644
index a8ac85d65..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar
new file mode 100644
index 000000000..593d33f57
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-4.1.10.Final.jar
deleted file mode 100644
index f534c034b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar
new file mode 100644
index 000000000..7f694d00a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-4.1.10.Final.jar
deleted file mode 100644
index 92d74fd3a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar
new file mode 100644
index 000000000..2e5c7892c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final.jar
deleted file mode 100644
index f54d7489b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar
new file mode 100644
index 000000000..d533819bf
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.0.6.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
deleted file mode 100644
index 1e9f71b8c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar
new file mode 100644
index 000000000..e2f2c5928
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-4.2.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-4.2.0.Final.jar
deleted file mode 100644
index 84efeac2c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-4.2.0.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-analyzers-4.2.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-analyzers-4.2.0.Final.jar
deleted file mode 100644
index 4dcc34abe..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-analyzers-4.2.0.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar
deleted file mode 100644
index 3acd5ac09..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-5.5.2.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-5.5.2.Final.jar
new file mode 100644
index 000000000..13da63d37
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-5.5.2.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar
deleted file mode 100644
index 9f384c8a2..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-5.5.2.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-5.5.2.Final.jar
new file mode 100644
index 000000000..8ebf70bf5
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-5.5.2.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final.jar
deleted file mode 100644
index 565679363..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-5.2.2.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-5.2.2.Final.jar
new file mode 100644
index 000000000..ba4276432
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-5.2.2.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-cdi-5.2.2.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-cdi-5.2.2.Final.jar
new file mode 100644
index 000000000..37f8ab1fb
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-cdi-5.2.2.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar
deleted file mode 100644
index e010269dd..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-2.3.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-2.3.3.jar
new file mode 100644
index 000000000..2f05edf10
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-2.3.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar
deleted file mode 100644
index 53c1c262b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar
new file mode 100644
index 000000000..b9c0c1c25
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.5.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar
new file mode 100644
index 000000000..f6a7cd4d1
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-cache-4.2.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.4.jar
deleted file mode 100644
index 9f45bd91c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar
new file mode 100644
index 000000000..ac4a87730
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.4.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar
new file mode 100644
index 000000000..53a642012
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpmime-4.5.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/icu4j-2.6.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/icu4j-2.6.1.jar
deleted file mode 100644
index 9b5f51f8f..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/icu4j-2.6.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar
deleted file mode 100755
index 2ec64a81a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-runtime-2.21.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-runtime-2.21.jar
new file mode 100644
index 000000000..aa950a84e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-runtime-2.21.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-tools-2.21.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-tools-2.21.jar
new file mode 100644
index 000000000..acfa7e3cc
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/istack-commons-tools-2.21.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.4.0.jar
deleted file mode 100644
index e1e27130d..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.4.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.5.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.5.8.jar
new file mode 100644
index 000000000..3f6ea6c30
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.5.8.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar
new file mode 100644
index 000000000..9efc5bd9b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-annotations-2.6.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar
new file mode 100644
index 000000000..1a31f17c2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-2.6.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-asl-1.8.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-asl-1.8.8.jar
deleted file mode 100644
index 05f3353ef..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-asl-1.8.8.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar
new file mode 100644
index 000000000..5812b4714
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-databind-2.6.4.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-mapper-asl-1.8.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-mapper-asl-1.8.8.jar
deleted file mode 100644
index 7c7cd2191..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-mapper-asl-1.8.8.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jakarta-regexp-1.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jakarta-regexp-1.4.jar
deleted file mode 100644
index 5d70c357a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jakarta-regexp-1.4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jandex-2.0.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jandex-2.0.0.Final.jar
new file mode 100644
index 000000000..d24086ae4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jandex-2.0.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.17.1-GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.17.1-GA.jar
deleted file mode 100644
index a24898076..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.17.1-GA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.20.0-GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.20.0-GA.jar
new file mode 100644
index 000000000..0f1ff725d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.20.0-GA.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-2.2.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-2.2.6.jar
new file mode 100644
index 000000000..90a9ab5d2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-2.2.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-api-2.2.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-api-2.2.5.jar
new file mode 100644
index 000000000..4a3001ee8
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.el-api-2.2.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javax.servlet-api-3.1.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.servlet-api-3.1.0.jar
new file mode 100644
index 000000000..6b14c3d26
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/javax.servlet-api-3.1.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.12.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.12.jar
new file mode 100644
index 000000000..3f4638ce6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.12.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar
deleted file mode 100644
index ae2adeecd..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-core-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-core-2.2.11.jar
new file mode 100644
index 000000000..cc0aad1f8
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-core-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar
deleted file mode 100644
index 4977608b4..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-jxc-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-jxc-2.2.11.jar
new file mode 100644
index 000000000..79db7c459
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-jxc-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-runtime-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-runtime-2.2.11.jar
new file mode 100644
index 000000000..a1f047f66
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-runtime-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar
deleted file mode 100644
index f8e5ff8fb..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2.11.jar
new file mode 100644
index 000000000..0a753d0b6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb1-impl-2.2-EA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb1-impl-2.2-EA.jar
deleted file mode 100644
index 6717848af..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb1-impl-2.2-EA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.6.jar
similarity index 57%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.6.jar
index c2016095f..52f47a4f4 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.3.GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.3.GA.jar
deleted file mode 100644
index ff3a103c0..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.3.GA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.3.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.3.0.Final.jar
new file mode 100644
index 000000000..ea45d4d34
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.3.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar
deleted file mode 100644
index b3bf81f60..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar
new file mode 100644
index 000000000..1a1ceeec5
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jdom2-2.0.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jdom2-2.0.6.jar
new file mode 100644
index 000000000..2850ca10c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jdom2-2.0.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-arq-2.13.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-arq-2.13.0.jar
new file mode 100644
index 000000000..3b17e6e7f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-arq-2.13.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar
deleted file mode 100644
index 7d7d21082..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.13.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.13.0.jar
new file mode 100644
index 000000000..ba93796c9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.13.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar
deleted file mode 100644
index f54fb49bb..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.1.2.jar
new file mode 100644
index 000000000..d520498e6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.1.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jena-tdb-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-tdb-1.1.2.jar
new file mode 100644
index 000000000..580c9cdf6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jena-tdb-1.1.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar
deleted file mode 100644
index b2aca95bb..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.9.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.9.1.jar
new file mode 100644
index 000000000..583e06a08
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.9.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/json-20090211.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/json-20090211.jar
new file mode 100644
index 000000000..ef2909409
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/json-20090211.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jsonld-java-0.5.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jsonld-java-0.5.1.jar
new file mode 100644
index 000000000..d61cc0f70
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jsonld-java-0.5.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jta-1.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jta-1.1.jar
new file mode 100644
index 000000000..7736ec9f0
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jta-1.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.1.jar
similarity index 50%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.1.jar
index 60f119cac..518b425d3 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.11.jar
deleted file mode 100644
index aaf744484..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.11.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar
new file mode 100644
index 000000000..3a7fc266c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.12.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.5.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.5.0.jar
deleted file mode 100644
index b1e1c5135..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.5.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.7.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.7.2.jar
new file mode 100644
index 000000000..93aee137f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.7.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/libthrift-0.9.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/libthrift-0.9.2.jar
new file mode 100644
index 000000000..39143a50c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/libthrift-0.9.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar
deleted file mode 100644
index 752c71448..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-common-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-common-5.4.0.jar
new file mode 100644
index 000000000..16b447e17
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-common-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.0.jar
new file mode 100644
index 000000000..73ae74e4b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2.jar
deleted file mode 100644
index cc374b707..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-5.4.0.jar
new file mode 100644
index 000000000..52d41e54a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-3.6.2.jar
deleted file mode 100644
index 7b8d21c43..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.0.jar
new file mode 100644
index 000000000..fa65b53ba
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-3.6.2.jar
deleted file mode 100644
index 37a44066b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.0.jar
new file mode 100644
index 000000000..694e569af
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-3.6.2.jar
deleted file mode 100644
index 47923cc46..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.0.jar
new file mode 100644
index 000000000..fc565b589
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.0.jar
new file mode 100644
index 000000000..34193e1da
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-kuromoji-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-kuromoji-3.6.2.jar
deleted file mode 100644
index 093efbd8f..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-kuromoji-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-3.6.2.jar
deleted file mode 100644
index 5e1937f46..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.0.jar
new file mode 100644
index 000000000..0853094dc
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-3.6.2.jar
deleted file mode 100644
index 627665604..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.0.jar
new file mode 100644
index 000000000..4cc68c3b9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-phonetic-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-phonetic-3.6.2.jar
deleted file mode 100644
index b67de4cb2..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-phonetic-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-3.6.2.jar
deleted file mode 100644
index 8e2c2b755..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.0.jar
new file mode 100644
index 000000000..52e3d0218
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queryparser-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queryparser-5.4.0.jar
new file mode 100644
index 000000000..d928ea956
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queryparser-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-sandbox-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-sandbox-5.4.0.jar
new file mode 100644
index 000000000..b68415977
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-sandbox-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-smartcn-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-smartcn-3.6.2.jar
deleted file mode 100644
index ea5930b36..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-smartcn-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spatial-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spatial-3.6.2.jar
deleted file mode 100644
index 2f2bf0b31..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spatial-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2.jar
deleted file mode 100644
index 501701dc8..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar
deleted file mode 100644
index bf8393379..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-suggest-5.4.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-suggest-5.4.0.jar
new file mode 100644
index 000000000..4c0156d9e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-suggest-5.4.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mapstruct-1.0.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mapstruct-1.0.0.Final.jar
new file mode 100644
index 000000000..20a0d2c71
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/mapstruct-1.0.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.11.jar
new file mode 100644
index 000000000..88f1d47d3
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar
deleted file mode 100644
index c44160e2b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar
deleted file mode 100644
index c640a8d1a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar
new file mode 100644
index 000000000..be09493c0
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/objenesis-1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/objenesis-1.2.jar
deleted file mode 100644
index fb04d7fa6..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/objenesis-1.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar
deleted file mode 100644
index 4cf488ee3..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar
deleted file mode 100644
index f131a431c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE.jar
deleted file mode 100644
index 3b9cbb1c7..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE.jar
deleted file mode 100644
index b8c059525..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE.jar
deleted file mode 100644
index 172c39541..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE.jar
deleted file mode 100644
index e285a2104..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE.jar
deleted file mode 100644
index 0b73e4acf..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE.jar
deleted file mode 100644
index f992bff33..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE.jar
deleted file mode 100644
index a46dc3a1c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE.jar
deleted file mode 100644
index 412412be6..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE.jar
deleted file mode 100644
index 84af61cbf..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.test-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.test-3.2.2.RELEASE.jar
deleted file mode 100644
index 30962d0e0..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.test-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE.jar
deleted file mode 100644
index 4d4c662bf..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE.jar
deleted file mode 100644
index bfe1d9737..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE.jar
deleted file mode 100644
index 015aacdd6..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-1.3.jar
deleted file mode 100644
index 44b8987f3..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar
new file mode 100644
index 000000000..e15837718
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-2.1.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/paranamer-2.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/paranamer-2.3.jar
deleted file mode 100644
index ad12ae9a3..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/paranamer-2.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar
new file mode 100644
index 000000000..e4de16fef
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar
deleted file mode 100644
index 1cf1a7a60..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar
new file mode 100644
index 000000000..feab196ec
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar
deleted file mode 100644
index 8862e2175..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.13.jar
new file mode 100644
index 000000000..a9e380085
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar
deleted file mode 100644
index 0782b07d4..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.13.jar
new file mode 100644
index 000000000..726768cfd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.13.jar
similarity index 70%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.13.jar
index 24d719e70..bd883978b 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar
deleted file mode 100644
index 63e54165e..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar
new file mode 100644
index 000000000..0e470f5ea
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.4-1205-jdbc42.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/relaxngDatatype-20020414.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/relaxngDatatype-20020414.jar
new file mode 100644
index 000000000..db9206f63
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/relaxngDatatype-20020414.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/rngom-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/rngom-2.2.11.jar
new file mode 100644
index 000000000..00cf5b444
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/rngom-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/servlet-api-2.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/servlet-api-2.5.jar
deleted file mode 100644
index fb5249346..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/servlet-api-2.5.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.13.jar
new file mode 100644
index 000000000..f07884ee7
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.2.jar
deleted file mode 100644
index 1a8870833..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.13.jar
new file mode 100644
index 000000000..a8dd5c5a4
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.2.jar
deleted file mode 100644
index 5dfcf4b91..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-nop-1.7.13.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-nop-1.7.13.jar
new file mode 100644
index 000000000..5496e46a1
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-nop-1.7.13.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/snappy-java-1.0.4.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/snappy-java-1.0.4.1.jar
deleted file mode 100644
index 819891928..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/snappy-java-1.0.4.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/solr-analysis-extras-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/solr-analysis-extras-3.6.2.jar
deleted file mode 100644
index a7e7d6e69..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/solr-analysis-extras-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/solr-core-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/solr-core-3.6.2.jar
deleted file mode 100644
index 010fb3bf7..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/solr-core-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/solr-solrj-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/solr-solrj-3.6.2.jar
deleted file mode 100644
index 1f91eec73..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/solr-solrj-3.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-3.2.2.RELEASE.jar
deleted file mode 100644
index 386fe329f..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..7fb0ba7ee
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aspects-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aspects-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..8be842461
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-aspects-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-3.2.2.RELEASE.jar
deleted file mode 100644
index 52d0ae60b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..89232b49c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-3.2.2.RELEASE.jar
deleted file mode 100644
index b027ab850..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..38cfab65a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-3.2.2.RELEASE.jar
deleted file mode 100644
index f1df10b9c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..d979371a7
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-3.2.2.RELEASE.jar
deleted file mode 100644
index 906326dea..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..f2cd8fb58
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-3.2.2.RELEASE.jar
deleted file mode 100644
index b5c6f1a6d..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..483f3f1fd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-jdbc-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-jdbc-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..4f0abf1cd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-jdbc-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-orm-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-orm-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..e4f6ccae8
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-orm-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-oxm-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-oxm-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..f191a6b4b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-oxm-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-core-1.2.0.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-core-1.2.0.RELEASE.jar
new file mode 100644
index 000000000..c290363e2
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-core-1.2.0.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-metadata-1.2.0.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-metadata-1.2.0.RELEASE.jar
new file mode 100644
index 000000000..6eaa98c77
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-plugin-metadata-1.2.0.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.3.RELEASE.jar
deleted file mode 100644
index 37f66bc2b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.3.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-4.0.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-4.0.3.RELEASE.jar
new file mode 100644
index 000000000..427c2b2e6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-4.0.3.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar
deleted file mode 100644
index 81e356681..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-4.0.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-4.0.3.RELEASE.jar
new file mode 100644
index 000000000..18c51b3a3
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-4.0.3.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar
deleted file mode 100644
index 6268e5868..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-web-4.0.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-web-4.0.3.RELEASE.jar
new file mode 100644
index 000000000..018f1920b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-web-4.0.3.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-test-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-test-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..f5a669108
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-test-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-tx-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-tx-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..dda3bc062
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-tx-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-web-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-web-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..d7885958e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-web-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-webmvc-4.2.4.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-webmvc-4.2.4.RELEASE.jar
new file mode 100644
index 000000000..ee878144a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-webmvc-4.2.4.RELEASE.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-core-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-core-2.3.1.jar
new file mode 100644
index 000000000..0cedf119b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-core-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-schema-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-schema-2.3.1.jar
new file mode 100644
index 000000000..e1ccee673
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-schema-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spi-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spi-2.3.1.jar
new file mode 100644
index 000000000..2dd98732a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spi-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spring-web-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spring-web-2.3.1.jar
new file mode 100644
index 000000000..c64b035ac
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-spring-web-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger-common-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger-common-2.3.1.jar
new file mode 100644
index 000000000..31302c9fe
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger-common-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger2-2.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger2-2.3.1.jar
new file mode 100644
index 000000000..31744dfbc
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/springfox-swagger2-2.3.1.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/standard-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/standard-1.1.2.jar
new file mode 100644
index 000000000..bc528acb9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/standard-1.1.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar
new file mode 100644
index 000000000..31a6aad6c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar
deleted file mode 100644
index 6c6f5c236..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar
new file mode 100644
index 000000000..b1f4405ba
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar
new file mode 100644
index 000000000..a14a5ff73
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/tools.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/tools.jar
new file mode 100644
index 000000000..4f98c8060
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/tools.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/txw2-2.2.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/txw2-2.2.11.jar
new file mode 100644
index 000000000..eca81b252
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/txw2-2.2.11.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-easymock-3.4.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-easymock-3.4.2.jar
new file mode 100644
index 000000000..01b1f9567
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-easymock-3.4.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-inject-3.4.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-inject-3.4.2.jar
new file mode 100644
index 000000000..25351e108
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-inject-3.4.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-mock-3.4.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-mock-3.4.2.jar
new file mode 100644
index 000000000..588258e85
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-mock-3.4.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-orm-3.4.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-orm-3.4.2.jar
new file mode 100644
index 000000000..538064a8e
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/unitils-orm-3.4.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.0.0.GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.0.0.GA.jar
deleted file mode 100644
index 1ff2dd718..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.0.0.GA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.1.0.Final.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.1.0.Final.jar
new file mode 100644
index 000000000..de8540386
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.1.0.Final.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar
deleted file mode 100644
index b9ffc36b9..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.3.jar
new file mode 100644
index 000000000..b9c10b97c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.3.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/x-1.1.2.tld b/eu.etaxonomy.taxeditor.cdmlib/lib/x-1.1.2.tld
new file mode 100644
index 000000000..e52ffe837
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.cdmlib/lib/x-1.1.2.tld
@@ -0,0 +1,448 @@
+
+
+
+
+ JSTL 1.1 XML library
+ JSTL XML
+ 1.1
+ x
+ http://java.sun.com/jsp/jstl/xml
+
+
+
+ Provides validation features for JSTL XML tags.
+
+
+ org.apache.taglibs.standard.tlv.JstlXmlTLV
+
+
+
+
+
+ Simple conditional tag that establishes a context for
+ mutually exclusive conditional operations, marked by
+ <when> and <otherwise>
+
+ choose
+ org.apache.taglibs.standard.tag.common.core.ChooseTag
+ JSP
+
+
+
+
+ Like <%= ... >, but for XPath expressions.
+
+ out
+ org.apache.taglibs.standard.tag.rt.xml.ExprTag
+ empty
+
+
+XPath expression to be evaluated.
+
+ select
+ true
+ false
+
+
+
+Determines whether characters <,>,&,'," in the
+resulting string should be converted to their
+corresponding character entity codes. Default
+value is true.
+
+ escapeXml
+ false
+ true
+
+
+
+
+
+ XML conditional tag, which evalutes its body if the
+ supplied XPath expression evalutes to 'true' as a boolean
+
+ if
+ org.apache.taglibs.standard.tag.common.xml.IfTag
+ JSP
+
+
+The test condition that tells whether or not the
+body content should be processed.
+
+ select
+ true
+ false
+
+
+
+Name of the exported scoped variable for the
+resulting value of the test condition. The type
+of the scoped variable is Boolean.
+
+ var
+ false
+ false
+
+
+
+Scope for var.
+
+ scope
+ false
+ false
+
+
+
+
+
+ XML iteration tag.
+
+ forEach
+ org.apache.taglibs.standard.tag.common.xml.ForEachTag
+ JSP
+
+
+Name of the exported scoped variable for the
+current item of the iteration. This scoped variable
+has nested visibility. Its type depends on the
+result of the XPath expression in the select
+attribute.
+
+ var
+ false
+ false
+
+
+
+XPath expression to be evaluated.
+
+ select
+ true
+ false
+
+
+
+Iteration begins at the item located at the
+specified index. First item of the collection has
+index 0.
+
+ begin
+ false
+ true
+ int
+
+
+
+Iteration ends at the item located at the specified
+index (inclusive).
+
+ end
+ false
+ true
+ int
+
+
+
+Iteration will only process every step items of
+the collection, starting with the first one.
+
+ step
+ false
+ true
+ int
+
+
+
+Name of the exported scoped variable for the
+status of the iteration. Object exported is of type
+javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+
+ varStatus
+ false
+ false
+
+
+
+
+
+ Subtag of <choose> that follows <when> tags
+ and runs only if all of the prior conditions evaluated to
+ 'false'
+
+ otherwise
+ org.apache.taglibs.standard.tag.common.core.OtherwiseTag
+ JSP
+
+
+
+
+ Adds a parameter to a containing 'transform' tag's Transformer
+
+ param
+ org.apache.taglibs.standard.tag.rt.xml.ParamTag
+ JSP
+
+
+Name of the transformation parameter.
+
+ name
+ true
+ true
+
+
+
+Value of the parameter.
+
+ value
+ false
+ true
+
+
+
+
+
+ Parses XML content from 'source' attribute or 'body'
+
+ parse
+ org.apache.taglibs.standard.tag.rt.xml.ParseTag
+ org.apache.taglibs.standard.tei.XmlParseTEI
+ JSP
+
+
+Name of the exported scoped variable for
+the parsed XML document. The type of the
+scoped variable is implementation
+dependent.
+
+ var
+ false
+ false
+
+
+
+Name of the exported scoped variable for
+the parsed XML document. The type of the
+scoped variable is
+org.w3c.dom.Document.
+
+ varDom
+ false
+ false
+
+
+
+Scope for var.
+
+ scope
+ false
+ false
+
+
+
+Scope for varDom.
+
+ scopeDom
+ false
+ false
+
+
+
+Deprecated. Use attribute 'doc' instead.
+
+ xml
+ false
+ true
+
+
+
+Source XML document to be parsed.
+
+ doc
+ false
+ true
+
+
+
+The system identifier (URI) for parsing the
+XML document.
+
+ systemId
+ false
+ true
+
+
+
+Filter to be applied to the source
+document.
+
+ filter
+ false
+ true
+
+
+
+
+
+ Saves the result of an XPath expression evaluation in a 'scope'
+
+ set
+ org.apache.taglibs.standard.tag.common.xml.SetTag
+ empty
+
+
+Name of the exported scoped variable to hold
+the value specified in the action. The type of the
+scoped variable is whatever type the select
+expression evaluates to.
+
+ var
+ true
+ false
+
+
+
+XPath expression to be evaluated.
+
+ select
+ false
+ false
+
+
+
+Scope for var.
+
+ scope
+ false
+ false
+
+
+
+
+
+ Conducts a transformation given a source XML document
+ and an XSLT stylesheet
+
+ transform
+ org.apache.taglibs.standard.tag.rt.xml.TransformTag
+ org.apache.taglibs.standard.tei.XmlTransformTEI
+ JSP
+
+
+Name of the exported
+scoped variable for the
+transformed XML
+document. The type of the
+scoped variable is
+org.w3c.dom.Document.
+
+ var
+ false
+ false
+
+
+
+Scope for var.
+
+ scope
+ false
+ false
+
+
+
+Result
+Object that captures or
+processes the transformation
+result.
+
+ result
+ false
+ true
+
+
+
+Deprecated. Use attribute
+'doc' instead.
+
+ xml
+ false
+ true
+
+
+
+Source XML document to be
+transformed. (If exported by
+<x:set>, it must correspond
+to a well-formed XML
+document, not a partial
+document.)
+
+ doc
+ false
+ true
+
+
+
+Deprecated. Use attribute
+'docSystemId' instead.
+
+ xmlSystemId
+ false
+ true
+
+
+
+The system identifier (URI)
+for parsing the XML
+document.
+
+ docSystemId
+ false
+ true
+
+
+
+javax.xml.transform.Source
+Transformation stylesheet as
+a String, Reader, or
+Source object.
+
+ xslt
+ false
+ true
+
+
+
+The system identifier (URI)
+for parsing the XSLT
+stylesheet.
+
+ xsltSystemId
+ false
+ true
+
+
+
+
+
+ Subtag of <choose> that includes its body if its
+ expression evalutes to 'true'
+
+ when
+ org.apache.taglibs.standard.tag.common.xml.WhenTag
+ JSP
+
+
+The test condition that tells whether or
+not the body content should be
+processed
+
+ select
+ true
+ false
+
+
+
+
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.6.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.6.0.jar
deleted file mode 100644
index 73cf175fa..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.6.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar
new file mode 100644
index 000000000..007be3960
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar
deleted file mode 100644
index 2dd837714..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.6.0.jar
similarity index 55%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.6.0.jar
index ccd816342..d1b66271f 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.6.0.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar
deleted file mode 100644
index d7c072d2d..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.6.jar
new file mode 100644
index 000000000..b9328ef00
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.6.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar
deleted file mode 100644
index 22cd958b6..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.2.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.2.5.jar
new file mode 100644
index 000000000..1f71ab920
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.2.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xsom-20140925.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xsom-20140925.jar
new file mode 100644
index 000000000..f391598d9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xsom-20140925.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar
deleted file mode 100644
index dcedd5aad..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.8.jar
new file mode 100644
index 000000000..a493c3b99
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.8.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 8828c7133..1ce986570 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -39,7 +39,7 @@
cdmlib-remote-webapp
- cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote
+ cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote,cdmlib-test
${basedir}/lib
true
@@ -226,6 +226,11 @@
cdmlib-ext
${cdmlib.version}
+
+ eu.etaxonomy
+ cdmlib-test
+ ${cdmlib.version}
+
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
index 30289e812..0516b1a42 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
@@ -18,7 +18,7 @@ import java.util.Set;
import java.util.UUID;
import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.hibernate.LockOptions;
import org.hibernate.Session;
import org.hibernate.criterion.Criterion;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
index 9d43c0087..96726beeb 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
@@ -18,7 +18,7 @@ import java.util.Set;
import java.util.UUID;
import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.hibernate.LockOptions;
import org.hibernate.Session;
import org.hibernate.criterion.Criterion;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
index fc6cf73c4..0289d9a84 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
@@ -18,7 +18,7 @@ import java.util.Set;
import java.util.UUID;
import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.hibernate.LockOptions;
import org.hibernate.Session;
import org.hibernate.criterion.Criterion;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
index 3988724a7..81278277d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
@@ -14,7 +14,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Display;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.SecurityExceptionUtils;
+import eu.etaxonomy.cdm.test.integration.SecurityExceptionUtils;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;