ref #10067, #9359, #10009 remove not used entries in bin.includes and fix copying...

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 8ad97f6d83af5d54bbe248e0894e6c6296c1e18c..1e3d2a4e6a150b44d09aecff04761e6c0a10dae0 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -26,11 +26,11 @@ bin.includes = META-INF/,\
                lib/h2-1.4.190.jar,\
                lib/hibernate-commons-annotations-5.1.2.Final.jar,\
                lib/hibernate-core-5.4.33.Final.jar,\
-               lib/hibernate-envers-5.4.33.Final.jar,\
+
                lib/hibernate-jpa-2.1-api-1.0.2.Final.jar,\
                lib/hibernate-search-engine-5.11.10.Final.jar,\
                lib/hibernate-search-orm-5.11.10.Final.jar,\
-               lib/hibernate-validator-6.2.3.Final.jar,\
+
                lib/javax.persistence-api-2.2.jar,\
                lib/httpclient-4.5.13.jar,\
                lib/httpclient-cache-4.5.13.jar,\
@@ -83,11 +83,7 @@ bin.includes = META-INF/,\
                lib/poi-ooxml-4.1.2.jar,\
                lib/poi-ooxml-schemas-4.1.2.jar,\
                lib/postgresql-42.3.6.jar,\
-               lib/lucene-core-5.5.5.jar,\
-               lib/lucene-queryparser-5.5.5.jar,\
-               lib/lucene-analyzers-common-5.5.5.jar,\
-               lib/lucene-sandbox-5.5.5.jar,\
-               lib/lucene-suggest-5.5.5.jar,\
+
                lib/cdmlib-cache-5.32.0-SNAPSHOT.jar,\
                lib/org.swtchart_0.10.0.v20160212.jar,\
                lib/commons-collections4-4.4.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index c493d345b38e2851799b5e92404974d7917aae08..2877f6f577143de091243515b7a9a4f75f7a8026 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -82,7 +82,7 @@
                 xml-apis,lsid-client,jdom,jdom2,\r
                 poi,poi-ooxml,poi-ooxml-schemas,xmlbeans,commons-collections4,commons-math3,\r
                 c3p0,mchange-commons-java,\r
-                opencsv,joda-time,usertype.jodatime,usertype.spi,\r
+                opencsv,joda-time,usertype.core,\r
                 apache-log4j-extras,\r
                 h2,mysql-connector-java,postgresql,\r
                 junit,hamcrest-core,commons-dbcp,commons-pool,\r