ref #9340: fix sec handling for homotypic syn when moving acc to syn of another acc

[cdmlib.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 7d7946ff320977d0a3ba569570bb2340b30dac01..256b0278083ac2080d2f11aee81006b7c6adbecf 100644 (file)
--- 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
@@ -94,7 +104,6 @@ cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifQueryServiceWr
 cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/openurl/MobotOpenUrlServiceWrapperTest.java -text
 cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/sru/SruServiceWrapperTest.java -text
 cdmlib-ext/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text
-cdmlib-ext/src/test/resources/dbscripts/001-cdm.h2.sql -text
 cdmlib-ext/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
 cdmlib-ext/src/test/resources/eu/etaxonomy/cdm/ext/geo/cyprusdivs.csv -text
 cdmlib-ext/src/test/resources/log4j.properties -text
@@ -587,7 +596,6 @@ cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlImportConfiguratorTest.
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/test/function/TestDatabase.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text
-cdmlib-io/src/test/resources/dbscripts/001-cdm.h2.sql -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/BlankDataSet.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/ClearDBDataSet.xml -text
@@ -1303,7 +1311,6 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/ICdmDataSource.java -
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/LocalH2.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/LocalHsqldb.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/NamedContextHolder.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/NomenclaturalCodeAwareDataSource.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PermissionDeniedException.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/UpdatableRoutingDataSource.java -text
@@ -1694,7 +1701,6 @@ cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/unitils/DdlCreator.java -
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/unitils/FlatFullXmlWriter.java -text
 cdmlib-persistence/src/test/resources/META-INF/persistence_old.xml -text
 cdmlib-persistence/src/test/resources/c3p0-config.xml -text
-cdmlib-persistence/src/test/resources/dbscripts/001-cdm.h2.sql -text
 cdmlib-persistence/src/test/resources/dbscripts/hibernate.properties -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-securityTest.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.common.xml -text
@@ -1867,7 +1873,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
@@ -2505,7 +2510,6 @@ cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSu
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_s3.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_s4.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/validation/ValidationTest.java -text
-cdmlib-services/src/test/resources/dbscripts/001-cdm.h2.sql -text
 cdmlib-services/src/test/resources/dbscripts/hibernate.properties -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/application/FirstDataInserterTest.testBlankDB-result.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/application/FirstDataInserterTest.testBlankDB.xml -text