Merge branch 'release/5.31.0'

[taxeditor.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6d5518a4830d7b433126763087bfc75c9d64f005..4001170dd55b9bbf29cd5dad4ab6e96ea64f594d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -37,9 +37,6 @@ eu.etaxonomy.taxeditor.webapp/lib/cdmlib-remote-webapp.war
 /runtime-taxeditor.product
 /workspace
 /*.patch
-/eu.etaxonomy.taxeditor.webapp/.settings/org.eclipse.core.resources.prefs
-/eu.etaxonomy.taxeditor.webapp/.settings/org.eclipse.m2e.core.prefs
-/eu.etaxonomy.taxeditor.webapp/lib/
 
 /.ssh
 eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.xsd
@@ -83,14 +80,7 @@ eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-8.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-42.2.15.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-1.4.01.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/lsid-client-1.1.2.jar
-eu.etaxonomy.taxeditor.test/lib/unitils-core-3*.jar
-eu.etaxonomy.taxeditor.test/lib/unitils-database-3*.jar
-eu.etaxonomy.taxeditor.test/lib/unitils-dbmaintainer-3*.jar
-eu.etaxonomy.taxeditor.test/lib/unitils-dbunit-3*.jar
-eu.etaxonomy.taxeditor.test/lib/unitils-spring-3*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang-2.*.jar
-eu.etaxonomy.taxeditor.test/lib/c3p0-0.*.jar
-eu.etaxonomy.taxeditor.test/lib/dbunit-2.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/jdom-1.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/jdom2-2.*.jar
@@ -98,6 +88,7 @@ eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-3.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/poi-4.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-4.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-4.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections4-4.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-math3-3.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.*.jar
@@ -113,25 +104,44 @@ eu.etaxonomy.taxeditor.cdmlib/lib/apache-log4j-extras-1.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/antlr-2.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-2.*.jar
-eu.etaxonomy.taxeditor.printpublisher/lib/cdmlib-*.jar
-eu.etaxonomy.taxeditor.test/lib/commons-dbcp-1.*.jar
-eu.etaxonomy.taxeditor.test/lib/commons-pool-1.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.*.jar
-eu.etaxonomy.taxeditor.test/lib/hamcrest-core-1.*.jar
-eu.etaxonomy.taxeditor.test/lib/junit-4.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/hamcrest-core-1.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-dbcp-1.*.jar
-eu.etaxonomy.taxeditor.printpublisher/lib/fop-2.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-42.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/jboss-transaction-api_1.2_spec-1.*.Final.jar
-eu.etaxonomy.taxeditor.local/lib/postgresql-42.2.15.jar
-eu.etaxonomy.taxeditor.local/lib/mysql-connector-java-8.0.21.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/objenesis-*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/commons-io-2.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-5.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-5.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/json-2*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/lucene-*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.*.jar
+
+eu.etaxonomy.taxeditor.test/lib/unitils-core-3*.jar
+eu.etaxonomy.taxeditor.test/lib/unitils-database-3*.jar
+eu.etaxonomy.taxeditor.test/lib/unitils-dbmaintainer-3*.jar
+eu.etaxonomy.taxeditor.test/lib/unitils-dbunit-3*.jar
+eu.etaxonomy.taxeditor.test/lib/unitils-spring-3*.jar
+eu.etaxonomy.taxeditor.test/lib/c3p0-0.*.jar
+eu.etaxonomy.taxeditor.test/lib/dbunit-2.*.jar
+eu.etaxonomy.taxeditor.test/lib/commons-dbcp-1.*.jar
+eu.etaxonomy.taxeditor.test/lib/commons-pool-1.*.jar
+eu.etaxonomy.taxeditor.test/lib/hamcrest-core-1.*.jar
+eu.etaxonomy.taxeditor.test/lib/junit-4.*.jar
+eu.etaxonomy.taxeditor.local/lib/postgresql-*.jar
+eu.etaxonomy.taxeditor.local/lib/mysql-connector-java-*.jar
 eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp.war
 eu.etaxonomy.taxeditor.local/lib/jtds-1.3.1.jar
-eu.etaxonomy.taxeditor.local/lib/mssql-jdbc-8.4.1.jre8.jar
+eu.etaxonomy.taxeditor.local/lib/mssql-jdbc-*.jar
 eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp.war
-eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-42.*.jar
-eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-*.jar
 eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp.war
-eu.etaxonomy.taxeditor.local/lib/postgresql-42.*.jar
 eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp-*.war
+eu.etaxonomy.taxeditor.printpublisher/lib/cdmlib-*.jar
+eu.etaxonomy.taxeditor.printpublisher/lib/fop-2.*.jar