EDIT

ref #9785 fix update script for measurement unit_ids

cleanup

ref #10097 add columnNameChanger for originalNameString to update script

move CdmUpdater to new model version

ref #10057 add accessed field to OriginalSourceBase (cont., fullDataGenerator)

ref #9908 additional changes for Credit.timePeriod

cleanup

ref #9908 add timePeriod to Credit

fix #9785 Update script for missing measurement unit_ids (matrix)

fix #9830 update México Distrito Federal label (add accent)

ref #9901 remove Media_RightsInfo.rights_id index

ref #10057 add accessed field to OriginalSourceBase

ref #10097 change originalNameString to originalInfo in cdmlib

ref #10083 update script for blocking reverse label and schema updater for v5.32

cleanup

ref #10072 change log4j.properties to log4j.xml in remaining cdmlib modules

ref #10072 change log4j.properties to log4j.xml in commons, model, persistence and services

ref #10095, ref #9359 remove javax.activation-api, jaxb-api and xalan from classpath (replaced by jakarta versions)

cleanup

ref #9359 add version number for commons-pool to avoid multiple versions in cdmserver comming from remote-webapp and vaadin (though unclear why vaadin retrieves a higher version)

move CdmApplicationUtils to real persistence package to avoid multiple scanning with service layer

cleanup

fix #10090 revert init strategy and catch LIE in getCollectorTitleCache()

cleanup

cleanup

cleanup

cleanup

ref #10067, ref #3722, ref #8127 remove all manual sortindex and null value handling from polytomous key (node)

ref #10067, ref #8127 remove remaining null value handling from taxon node

ref #10067, ref #3722, ref #8127 remove all manual sortindex and null value handling from term node

fix 10084: fix problem with missing taxonuuid in dto

ref #10076 fix HQL query (remove native)

ref #10076 fix HQL query (remove native)

ref #3722, ref #8127, ref #10067 fully remove sortindex updating and collection null handling workaround from TaxonNode

minor

cleanup

ref #10067, ref #10077 remove javassist as bytecode provider from cdmlib

ref #10076: fix taxonnodeDto creation for nodes without taxon and parent

use tuple class as return type

fix hibernate problem with returntype and taxonnodeDto for missing publish flag

ref #10071: add statusNote to dto again

update lineendings

ref #10067, #10070 reassign javassist as bytecode provider in cdmlib

revert changes in taxonnodeDto.noteStatus

revert changes in taxonnodeDto.noteStatus

ref #9359 fully remove hsqldb to be supported by cdmlib, we only use h2 now (cont 2)

revert changes to get statusNote

adapt test data

remove the hsql files again

ref #10071: add statusNote to dto

revert some changes added accidently

resolve the merge

white space problems

adapt tests to added description

cleanup

ref #9359 fully remove hsqldb to be supported by cdmlib, we only use h2 now (cont)

ref #9359 fully remove hsqldb to be supported by cdmlib, we only use h2 now

ref #9359 fully remove hsqldb to be supported by cdmlib, we only use h2 now

ref #10071: additional constructor and test added

cleanup

remove h2-datasource.xml as it is not used anymore

ref #10067 byteCodeProvider for HibernateConfiguration and factory methods

ref #9359 upgrade cdmlib to log4j 2

ref #10067 change back bytecode provider to javassist in hibernate.cfg.xmls

cleanup

ref #10067 revert bytecode provider in hibernate.cfg.xmls

minor

ref #10071: add node status to dto and implemented some tests

fix NPEs in DTO creation

taxon node status needs to be added to the dto

minor

ref #10067 try to use javassit as bytecode provider

ref #10071: create taxonnodeDTOs, add classification uuid

ref #10071: create taxonnodeDTOs also for a subtree

ref #10071: create taxonnodeDTOs directly from taxon uuid

create taxonnodeDto directly with taxonUuid - continue

ref #10067 remove direct dependencies to javassist and hibernate-jpa-2.1 from cdmlib-persistence

cleanup

cleanup

cleanup some base DAOs (rename, remove @Repository, ...)

cleanup

ref #10067 adapt getAllPersistedClasses() to new hibernate metadata handling

minor

ref #10067 update to hibernate 5.3 (cont.)

ref #10067 update to hibernate 5.3

cleanup

cleanup

ref #10067 improve handling of CdmPreferenceLookup (now ...Cache) to allow running with >1 entity managers (e.g. during maven tests)

cleanup

cleanup

ref #10067 fix query type in UserDaoImpl

cleanup

ref #10067 change to new hibernate Query class, adapt generics and use set Parameter instead old setXXX (cont.)

improve paging handling in multiple DAOs

cleanup

ref #10067 change to new hibernate Query class, adapt generics and use set Parameter instead old setXXX

ref #10067 adapt getFlushMode() to getHibernateFlushMode()

ref #10067 adapt IdentifiableEntity.cacheStrategy handling to avoid problem with unhandled generic handling and transient getter

cleanup

Updating develop poms back to pre merge state