EDIT

Merge branch 'release/5.41.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

updating poms for 5.42.0-SNAPSHOT development

add ATTR_FORCE_SYSTEM_CONSOLE_ENCODING to war.launch

reformat cdm-webapp.launch

format cdm-server help.launch, profile.launch, debug.launch and war.launch and adapt log4j->log4j2

Merge branch 'release/5.40.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

updating poms for 5.41.0-SNAPSHOT development

log4j2 git attributes

ref #8118 update mysql driver and spring schema version in templatesdatasources.xml for cdmserver

Merge branch 'release/5.39.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

updating poms for 5.40.0-SNAPSHOT development

Merge branch 'release/5.38.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

updating poms for 5.39.0-SNAPSHOT development

ref #10037: adapt ssmtp.conf

Merge branch 'release/5.37.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

updating poms for 5.38.0-SNAPSHOT development

Merge branch 'release/5.36.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

updating poms for 5.37.0-SNAPSHOT development

adapt ssmtp.conf

ref #10037: add smtp to docker container

Merge branch 'release/5.35.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

updating poms for 5.36.0-SNAPSHOT development

Merge branch 'release/5.34.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

updating poms for 5.35.0-SNAPSHOT development

ref #10055, ref #10072 upgrade to log4j2 2.19.0 in cdmserver

Merge branch 'release/5.33.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

updating poms for 5.34.0-SNAPSHOT development

set encoding for docker - continue

set encoding for docker - continue

set encoding for docker - continue

set encoding for docker

set encoding for docker

add env variable to set encoding

add env variable to set encoding

Merge branch 'release/5.32.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

updating poms for 5.33.0-SNAPSHOT development

ref #10055 add TODO in LoggingConfigurator

test fixed length logging

test date and context logging

javadoc

ref #9359, ref #10095 try to remove jakarta.el-api as apache-el is already on classpath in cdmserver

ref #9359 replace javax.el-api by jakarata.el-api

cleanup

ref #9359, ref #10072 add log4j2 to LoggingConfigurator in cdmserver

ref #9359, ref #10072, ref #10095 revert logging to logback classic for now and adapt correct handling for log4j in cdmserver

ref #10095 remove old el-impl version from cdmserver

cleanup

ref #9359, ref #10072, ref #10095 use log4j2 in cdmserver

ref #9359 update surefire plugin to 3.0.0-M7 in cdm-server

Merge branch 'release/5.31.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

updating poms for 5.32.0-SNAPSHOT development

ref #9972 temporarily switch of win32/exec build due to build problems after upgrading to debian 10 (cont.)

ref #9972 temporarily switch of win32/exec build due to build problems after upgrading to debian 10

Merge branch 'release/5.30.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

updating poms for 5.31.0-SNAPSHOT development

replace cybertaxonomy.eu by cybertaxonomy.org in cdm-server

revert incorrect merge

Merge branch 'release/5.29.0' into develop

jenkins merging release branch into master (strategy: theirs)

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

ref #9359 revert jgitflow to m6 in cdmserver

#9359 change javadoc.opts to doclint

change cdmserver from 5.29.1 to 5.30.0

updating poms for 5.29.1-SNAPSHOT development

updating poms for 5.29.0 branch with snapshot versions

ref #9359 mvn version prerequisites in cdmserver

ref #9359 revert to jackson-mapper-asl and upgrade resources plugin

http->https

ref #9359 revert jackson-databind to 2.0.0

ref #9359 update jackson to latest version with new groupId in cdmserver again

ref #9359 update exec, docker and gitflow plugin to latest version in cdmserver again

ref #9359 update ant plugin and buildnumber plugin to latest version in cdmserver again

ref #9359 update war and assembly plugin to latest version in cdmserver again

ref #9359 fix el-api artifactID

ref #9359 update el-api and el-impl and jopt-simple, dependency to latest version in cdmserver again

ref #9359 update javadoc, dependency and source plugin in cdmserver pom to latest version again