X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/dbaef697c798616633afc6f6da934d1bc4975174..e5668830c56900b331ec08172b150bbfdc2bce1e:/.gitattributes diff --git a/.gitattributes b/.gitattributes index 8426ba881c..eb4f9c3d7d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,14 @@ * text=auto !eol +pom.xml merge=ours +cdmlib-print/pom.xml merge=ours +cdmlib-test/pom.xml merge=ours +cdmlib-io/pom.xml merge=ours +cdmlib-ext/pom.xml merge=ours +cdmlib-model/pom.xml merge=ours +cdmlib-services/pom.xml merge=ours +cdmlib-remote-webapp/pom.xml merge=ours +cdmlib-remote/pom.xml merge=ours +cdmlib-persistence/pom.xml merge=ours /LICENSE.txt -text /README.txt -text cdmlib-commons/LICENSE.TXT -text @@ -107,6 +117,7 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTransformer.j cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/package.info -text cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CacheUpdater.java -text cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CacheUpdaterConfigurator.java -text +cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CacheUpdaterWithNewCacheStrategy.java -text cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultExport.java -text cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultImport.java -text cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultExport.java -text @@ -122,6 +133,8 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbImportBase.java -text cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbImportConfiguratorBase.java -text cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbImportStateBase.java -text cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DefaultImportState.java -text +cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DeleteNonReferencedReferencesConfigurator.java -text +cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DeleteNonReferencedreferencesUpdater.java -text cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ExportConfiguratorBase.java -text cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ExportStateBase.java -text cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ICdmExport.java -text @@ -974,11 +987,11 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationshipType. cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonComparator.java -text -cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonComparatorSearch.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNaturalComparator.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeAgentRelation.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeByNameComparator.java -text +cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeComparator.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationship.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationshipType.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/package-info.java -text @@ -1040,6 +1053,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/SectionDefa cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/ThesisDefaultCacheStrategy.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/WebPageDefaultCacheStrategy.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategy.java -text +cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseShortSecCacheStrategy.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/exceptions/StringNotParsableException.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/exceptions/UnknownCdmTypeException.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/generate/PolytomousKeyGenerator.java -text @@ -1863,7 +1877,6 @@ cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmlib-remote-servlet.xml -text cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/configurable.xml -text cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/datasources-local.xml -text cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml -text -cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/p6spy.xml -text cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml -text cdmlib-remote-webapp/src/main/webapp/WEB-INF/json-views.xml -text cdmlib-remote-webapp/src/main/webapp/WEB-INF/oai-views.xml -text @@ -2342,6 +2355,7 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/IncludedTaxonC cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/MatchingTaxonConfigurator.java -text cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/NameDeletionConfigurator.java -text cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/SpecimenDeleteConfigurator.java -text +cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/SwitchAgentConfigurator.java -text cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/SynonymDeletionConfigurator.java -text cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/TaxonBaseDeletionConfigurator.java -text cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/TaxonDeletionConfigurator.java -text