EDIT

ref #8132 c3p0 settings for debugging lost jdbc connections

loggin: eu.etaxonomy.cdm.cache.CdmTransientEntityCacher on level WARN

Merge branch 'release/5.5.0' into develop

updating poms for branch'release/5.5.0' with non-snapshot versions

updating poms for 5.6.0-SNAPSHOT development

updating docker image documentation

ref #6522 fixing problems with ARGs in Dockerfiles and more documentation

ref #6522 maven assembly moved into package phase

ref #6522 cleaning up docker config files

ref #6522 commenting run configuration

ref #6522 removing useless integration-test run config from docker plugin

ref #6522 adding fairly complete set of configuration and documentation for delpoying the cdm-server as docker image

eclipse launchers for cdm-webapp and cdmlib-remote-webapp

Merge branch 'release/5.4.0' into develop

updating poms for branch'release/5.4.0' with non-snapshot versions

updating poms for 5.5.0-SNAPSHOT development

ref #7085 Remove whitespace in log file time stamp

ref #7085 Adjust log path

ref #7085 Set logging to daily rollover

ref #7085 Adjust log path

Revert "ref #7085 Use DailyRollingFileAppender (in code)"

This reverts commit 02ef1e472669c30153c94f27084bde7e85e9482b.

ref #7085 Use DailyRollingFileAppender (in code)

ref #7085 Use DailyRollingFileAppender to generate one log per day

updating poms for 5.4.0-SNAPSHOT development

adjusting loglevel of bean initializers

Add Releases link

Merge branch 'release/5.2.0' into develop

updating poms for branch'release/5.2.0' with non-snapshot versions

updating poms for 5.3.0-SNAPSHOT development

Update CI link

Fix link to installation site

setting java code level to 1.8 and removing attribute fom launcher

Merge branch 'release/5.1.0' into develop

updating poms for branch'release/5.1.0' with non-snapshot versions

updating poms for 5.2.0-SNAPSHOT development

Increase platform-site-skin version

manually bumping version to 5.1.0-SNAPSHOT

updating poms for 4.16.0-SNAPSHOT development

Merge branch 'release/4.14.0' into develop

updating poms for branch'release/4.14.0' with non-snapshot versions

updating poms for 4.15.0-SNAPSHOT development

Merge branch 'release/4.13.0' into develop

updating poms for branch'release/4.13.0' with non-snapshot versions

updating poms for 4.14.0-SNAPSHOT development

text change

Merge branch 'release/4.12.0' into develop

updating poms for branch'release/4.12.0' with non-snapshot versions

updating poms for 4.13.0-SNAPSHOT development

Merge branch 'release/4.11.0' into develop

updating poms for branch'release/4.11.0' with non-snapshot versions

updating poms for 4.12.0-SNAPSHOT development

Merge branch 'release/4.10.0' into develop

updating poms for branch'release/4.10.0' with non-snapshot versions

updating poms for 4.11.0-SNAPSHOT development

Merge branch 'release/4.9.0' into develop

updating poms for branch'release/4.9.0' with non-snapshot versions

updating poms for 4.10.0-SNAPSHOT development

Merge branch 'release/4.8.0' into develop

updating poms for branch'release/4.8.0' with non-snapshot versions

updating poms for 4.9.0-SNAPSHOT development

Merge branch 'release/4.7.0' into develop

updating poms for branch'release/4.7.0' with non-snapshot versions

updating poms for 4.8.0-SNAPSHOT development

ref #6158 Update documentation from svn to git

• update links from trac to redmine
• update links to cybertaxonomy.eu

ref #6240 ref #6241 disabling doclint in javadoc for jdk.8

Merge branch 'release/4.6.0' into develop

updating poms for branch'release/4.6.0' with non-snapshot versions

prevent javadoc-plugin from failing under java 8

eclipse launcher to start from war

using jetty 9 runtime variable in launcher

updating poms for 4.7.0-SNAPSHOT development

follow up on package change in cdmlib

Merge branch 'hotfix/4.5.1' into develop

jenkins: setting project version to 4.5.1

updating poms for 4.5.1 branch with snapshot versions

Merge branch 'release/4.5.0' into develop

updating poms for branch'release/4.5.0' with non-snapshot versions

updating poms for 4.6.0-SNAPSHOT development

ref #6190 removing svn property place holder in first line of code

ref #6287 removing useless RollingFileAppender logger

removing java 1.8 settings from IDE launcher

Merge tag '4.4.1' into develop

release tag 4.4.1

Conflicts:
pom.xml

Merge branch 'hotfix/4.4.1'

manually pumping to release version 4.4.1

updating poms for 4.4.1 branch with snapshot versions

Merge branch 'release/4.4.0' into develop

updating poms for branch'release/4.4.0' with non-snapshot versions

updating poms for 4.5.0-SNAPSHOT development

Merge branch 'release/4.3.0' into develop

updating poms for branch'release/4.3.0' with non-snapshot versions

updating poms for 4.4.0-SNAPSHOT development

#5751 Remove explicit dependencies to DB drivers by cdmlib-db in CDM
Server

Merge branch 'release/4.2.0' into develop

updating poms for branch'release/4.2.0' with non-snapshot versions

setting sourceEncoding to UTF-8

setting sourceEncoding to UTF-8

updating poms for 4.3.0-SNAPSHOT development

Updating develop poms back to pre merge state

Merge branch 'master' into develop

Updating develop poms to hotfix version to avoid merge conflicts