EDIT

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

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

missed to add the adapted test

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

Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java

add test for ermIdInVocabularyComparator

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...

fix clone test for Media

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

ref #5974 Remove synonym relationship first compiling implementation in cdmlib

fix #6089 Remove taxonomicParentCache and taxonomicChildrenCount, fix Testdata

cleanup

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

Cleanup; Delete unnecessary test classes.

Adapt failing test in NonViralNameParserImplTest

ref #6086 solving the problems in the java-script of the web application monitor widget:
- chunk information: number rounded and label renamed
- Percentage number rounding fixed

correcting erroneous commit

fix #4497 solving problem with status parameter in taxon search

minor

ref #6032 Remove test for rank as mentioned in ticket

Add Vorabdr. to parsable volume

fix #6060 parse author with -e-

fix #6057 Accent Graph in author parser

ref #6032 test name parser support for hybrid ranks and non-hybrids

ref #6030 Add additional test for genus hybrid formula parsing

fix #6030 Parse Genus hybrid formulas correctly

ref #6045 Add test for getAncestor()

revert the changes in representation of rank infraspecific unranked

specimen import changes

#3868 Add nothovar. test

Allow whitespace after species epithet hybrid sign

#3868 Handle notho ranks correctly while formatting

cleanup

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

Cleanup; Delete unnecessary test classes.

Adapt failing test in NonViralNameParserImplTest

ref #6086 solving the problems in the java-script of the web application monitor widget:
- chunk information: number rounded and label renamed
- Percentage number rounding fixed

correcting erroneous commit

fix #4497 solving problem with status parameter in taxon search

minor

ref #6032 Remove test for rank as mentioned in ticket

Add Vorabdr. to parsable volume

fix #6060 parse author with -e-

fix #6057 Accent Graph in author parser

ref #6032 test name parser support for hybrid ranks and non-hybrids

ref #6030 Add additional test for genus hybrid formula parsing

fix #6030 Parse Genus hybrid formulas correctly

ref #6045 Add test for getAncestor()

revert the changes in representation of rank infraspecific unranked

specimen import changes

#3868 Add nothovar. test

Allow whitespace after species epithet hybrid sign

#3868 Handle notho ranks correctly while formatting

NameParser: allow letter for issue

#5960 Use abbrevTitle for reference parsing

#5931 Fix taxon cache strategy does not reflect protected flag in sec
reference

#5909 fix failing test

#5909 further improve referenced name parser

#5909 Improve referenced name parser, fix encoding and place published for article

#5909 Improve referenced name parser

Adapt ined. for NonVrialNameParser #5896

Add ined. to NonVrialNameParser #5896

Use syn. sec. instead of sec. for synonym sec references #5902

#5536 centralized handling of NULL removal related to HHH-9751 - test

Fix botanical name parsing species with infrageneric epithet #5881

Adding test for formatting species with infrageneric epi #5881

Implement parser for parsing species with infrageneric epithet #5881

Further develop the CDM preferences #3958

Reflect missing name taxon cache strategies #5838

Fix failing inReference cache reset #1815

revert last commit

minor

Further cleanup and rename new default cache strategy to default cache strategy #5833

Remove all old reference cache strategies completely #5833

Further clean up reference cache strategies #5833

Some further cleaning up for single reference cache strategy #5833

Implement single cache strategy for references #5833

• Implemented new class NewDefaultReferenceCacheStrategy and helper class TitleWithoutYearAndAuthorHelper
• Moved all functionality of old ReferenceCacheStrategies to new class(es)
• Moved all old strategies to package .old...

Remove generics from Reference in cdmlib-model #5830

Add secundum micro reference to cache strategy #5767

Adapt reusability of Credits / Rights

Remove bidirectionality for supplemental data #5743

Fix sort order for nom illeg with date #3338

Include nom. illeg. in homotypic group ordering #3338

fix CoordinateConverterTest #5716

Allow parsing of accent acute for coordinates #5716

Fix failing test

Fix test for factual data cache strategy #5547

Add nom. cons. des. to parser #5662

Add orth. rej. to parsing #5649 and clean up test

Some additional tests for sorting homotypical groups #3338

Add circular check for homotypicgouptaxon comparator #3338

Include rank comparison in HomotypicGroupTaxonComparator #3338

Improve sort order within a homotypic group (new Comparator) #3338

Improve sort order within a homotypic group (new Comparator) #3338

Fix combination author without space parsing #5618

Implement notho rank recognition #3868

Add new test for author name parsing

Fix cache strategy for taxon base with appended name #5586 and #5577

Add separator after nom status in taxon titleCache #5576

Merge branch 'hotfix/3.12.3' into develop

Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java

Fix volume range bug in name parser #5518