updating develop poms to master versions to avoid merge conflicts

[cdmlib.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 11c83af46c1ae7a4f876d0bf55aa0205f5fc7ac7..d8f15ee7b8dcd0e5e9ea9f4f441f58b55ba699e7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1,52 @@
-cdm/.classpath
-cdm/.externalToolBuilders
-cdm/.project
-cdm/alt
-cdm/cdmLibrary.jar
-cdm/db
-cdm/dist/zip/cdmLibrary
-cdm/lib/asm-2.2.3.jar
-cdm/lib/asm-commons-2.2.3.jar
-cdm/lib/aspectjlib-1.5.0.jar
-cdm/lib/aspectjrt-1.5.3.jar
-cdm/lib/aspectjtools-1.5.3.jar
-cdm/lib/aspectjweaver-1.5.3.jar
-cdm/manifest.txt
-cdm/src/eu/etaxonomy/cdm/validation
-cdm/src/org
-cdm/src/test
-cdm/test/eu/etaxonomy/cdm/test/model/agent
-cdm/test/eu/etaxonomy/cdm/test/model/common
-cdm/test/eu/etaxonomy/cdm/test/model/name/NameFactTest.java
-cdm/test/eu/etaxonomy/cdm/test/model/name/NameFactTypeTest.java
-cdm/test/eu/etaxonomy/cdm/test/model/name/NameRelationshipTypeTest.java
-cdm/test/eu/etaxonomy/cdm/test/model/name/NomenclaturalCodeTest.java
-cdm/test/eu/etaxonomy/cdm/test/model/name/RankTest.java
-cdm/test/eu/etaxonomy/cdm/test/model/name/TypeDesignationStatusTest.java
-cdm/test/eu/etaxonomy/cdm/test/model/name/TypeDesignationTest.java
-cdm/test/eu/etaxonomy/cdm/test/model/publication
-cdm/test/eu/etaxonomy/cdm/test/model/specimen
-cdm/test/eu/etaxonomy/cdm/test/model/taxon
-cdm/test/eu/etaxonomy/cdm/test/model/view
-cdm/test/testTaxonNameByEclipse.java
+.directory
+.metadata
+.classpath
+.project
+.settings
+hibernate.log
+PUBLIC.xsd
+dataset.xsd
+target
+.umlproject
+.externalToolBuilders
+error.log
+cdmlib-developer.log
+
+cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/ResultWrapper.java
+cdmlib-io/cdmlib-io.uml
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/Markup_OLD.java
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/schema/PUBLIC.xsd
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.xsd
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dwca/in/coreTax.txt
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dwca/in/meta.xml
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dwca/in/vernacular.txt
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/CdmImporterTest.xml.edited
+cdmlib-model/ajcore.*.txt
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ParserProblemRange.java
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/OrderedTermBaseTest.java
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java
+
+cdmlib-persistence/002_cdm.dll
+cdmlib-persistence/NewDataSet.xml
+
+cdmlib-persistence/cdmlib-persistence.uml
+
+cdmlib-persistence/src/test/resources/Copy[!!-~]of[!!-~]test.cdm.datasource.xml
+cdmlib-persistence/src/test/resources/dbscripts/Kopie[!!-~]von[!!-~]001_cdm.ddl
+
+cdmlib-persistence/test.xml
+cdmlib-print/*odf_output.odf
+
+
+cdmlib-services/CleanSweepInsertLoadStrategy-debug.xml
+
+cdmlib-services/cdmlib-services.uml
+cdmlib-services/src/main/resources/log4j.properties
+
+cdmlib-services/src/test/resources/eu/etaxonomy/cdm/integrationTest.xml
+
+
+!cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/ggbn/.settings
+!cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/.settings
+!cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v35_36/.settings
+workbench.xmi