EDIT

adapt GrantedAuthorityImpl factory method

ref #6459 added IntextReferenceHelper class and added some more tests (for name and Annotation)

fix #6459 Implement deduplication for IntextReferences

cleanup

ref #6362, ref #6365 remove occurrence of NonViralName, BotanicalName, ZoologicalName and others

fix #6405 more tests for CdmPermissionVoter.furtherVotingDescisions and fixing the premature returning of DENIED votes made there

ref #6405 tests for the CdmPermissionVoter

cleanup

Cleanup

ref #1606: add methods to provide filter for reference type

ref #6365 use TaxonNameFactory for botanical names

ref #6365 use TaxonNameFactory for zoological names

ref #6365 merge static methods from BotanicaName to TaxonNameBase

ref #6365 replace ZoologicalName factory methods

ref #6365 Move all ZoologicalName attributes up to TaxonNameBase

ref #6362 removed some NonViralName occurrences (non-compiling as changing in model are still missing)

fix #6296: fix problems for simple search

add test for different search combinations

fix #6342: fix exception for ? in selection dialog

fix #6296: include the common name search into the search query of taxa and synonyms

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

minor

fix #6236 add alphabetic length ordering to name search

Cleanup

fix #6128 include authorship option in taxon and name search

ref #6199 test for reading excluded, unplaced and excludedNote

solving polytomouskey node sort index problems

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestModelUpdate.java

cleanup

ref #5974 implement substitute method for TaxonService.getAllRelationships

Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java...

fix failing test

remaining merge issue for morge develop to cdm4.1

Merge remote-tracking branch 'origin/develop' into cdm-4.1

Conflicts:
cdmlib-db/pom.xml
cdmlib-ext/pom.xml
cdmlib-io/pom.xml
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java...

ref #6099: removing cascading to child nodes and adapting the service and persistence layer

cleanup

ref #3658 remove nomenclaturalCode from all datasource related classes

• and rename NomenclaturalCodeAwareDataSource

ref #5974 Replace synonymRelationshipType by SynonymType and replace some other occurrences of synonym relationship

ref #5974 Remove synonym relationship first compiling implementation in cdmlib

ref #3547 remove testDelete-result1 and cleanup and reuse testDelete-result

ref #3547 Cleanup TaxonDaoHibernateImplTest.xml

ref #3547 fix related tests

ref #3547 Cleanup TaxonDao.testGetTaxaByNameAndArea.xml test data a bit

fix #6089 Remove taxonomicParentCache and taxonomicChildrenCount, fix Testdata

fix #6122 add titleCache service

Minor cleanup

Cleanup

ref #6089 Remove failing irrelevant test

ref #6089 Remove all calls and methods for taxonomicChildrenCount and taxonomicParentCache

Cleanup; Delete unnecessary test classes.

missing changes in test

fix #6122 add titleCache service

Minor cleanup

Cleanup

ref #6089 Remove failing irrelevant test

ref #6089 Remove all calls and methods for taxonomicChildrenCount and taxonomicParentCache

Cleanup; Delete unnecessary test classes.

missing changes in test

#4965 Implement general solution for getDatabase() in
WrappedCdmDataSource

#5958 fix failing tests

#5958 Implement name part search as web service

Fix dataset issue in persistence test and clean up

Clean up

#5945 Deduplicate results from termloading by class

refactoring listByIds to loadByIds

attempt to reduce the overhead imposed by database access

#5852 dao, service and controler for taxonNode sibling retrieval

Try to fix pattern issue in taxon uuidAndTitleCache search

Simplify taxonDao

Further develop the CDM preferences #3958

minor

revert last commit

minor

Remove generics from Reference in cdmlib (except for cdmlib-model) #5830

Fix empty protected titlecaches #5763

Remove bidirectionality for supplemental data #5743

Clean up AnnotationDao and AnnotationService

Adapt AnnotationDaoTest #3701

Add IntextReference to related objects test classes

Javadoc

Fix deduplication problem with list order #5652

Add separator after nom status in taxon titleCache #5576

resolving conflicts after merge of ticket_4716 into develop

Cleanup description generics (related to #5357)

organizing imports

migrate to hibernate 5 for cdmlib-services and cdmlib-ext #4716

• (except for hibernate search tests)
• including new spring-config structure

Adapt cdmlib-persistence to new testing architecture #5370

Upgrade to hibernate 5 with persistence tests running #4716

Upgrade to spring 4.2.2, spring-security 4.0.2 and latest hibernate
validator #4716 and #4702

revert chamges in MatchMode

Fix bug for embeddable classes in AdvancedBeanInitializer #5383

fixing #4878

Add test to ensure bean initialization works on hibernate proxies #5077

minor

fixing getUUIDAndTitleCache for Classification and excluding taxa

Fully remove old vocabulary.byClass methods #3843

Remove listEmpty method from TermVocabularyDao #3843

Add vocabulary list method by term types #3843

#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods

fixing broken pager mechanism for listRankSpecificRootNodes() and improving test coverage