From: Patrick Plitzner
Date: Thu, 6 Apr 2017 17:36:12 +0000 (+0200)
Subject: ref #5752 cleanup dependencies in taxeditor.cdmlib Part 2
X-Git-Tag: 4.7.0^2~85
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/3fe309692029edc15eeb344099e4368f12527eef
ref #5752 cleanup dependencies in taxeditor.cdmlib Part 2
---
diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 0ad0d799b..6f3b2f160 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,5 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -93,84 +126,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -200,15 +162,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 1fbc7c69e..56c1dc17c 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -201,7 +201,6 @@ Export-Package: com.google.api,
eu.etaxonomy.taxeditor.service,
eu.etaxonomy.taxeditor.session,
eu.etaxonomy.taxeditor.session.mock,
- javassist.util.proxy,
javax.persistence,
junit.framework;uses:="org.junit.runner.manipulation,org.junit.runner,org.junit.runner.notification",
net.sf.ehcache,
@@ -276,9 +275,6 @@ Export-Package: com.google.api,
org.apache.log4j.spi,
org.w3c.dom,
org.xml.sax",
- org.apache.lucene.index,
- org.apache.lucene.queryparser.classic,
- org.apache.lucene.util,
org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
org.apache.xerces.dom,
org.h2.jdbc,
@@ -339,14 +335,6 @@ Export-Package: com.google.api,
org.joda.time.tz;uses:="org.joda.time",
org.junit;uses:="org.hamcrest",
org.junit.runner,
- org.odftoolkit.odfdom,
- org.odftoolkit.odfdom.doc,
- org.odftoolkit.odfdom.doc.office,
- org.odftoolkit.odfdom.doc.style,
- org.odftoolkit.odfdom.dom.element,
- org.odftoolkit.odfdom.dom.element.style,
- org.odftoolkit.odfdom.dom.style,
- org.slf4j,
org.springframework.aop,
org.springframework.aop.framework,
org.springframework.beans,
@@ -603,84 +591,13 @@ Bundle-ClassPath: .,
lib/itextpdf-5.5.8.jar,
lib/jackson-annotations-2.6.5.jar,
lib/jackson-core-2.6.5.jar,
- lib/jackson-core-asl-1.8.8.jar,
- lib/jackson-databind-2.6.5.jar,
- lib/jackson-mapper-asl-1.8.8.jar,
- lib/jakarta-regexp-1.4.jar,
- lib/jandex-2.0.0.Final.jar,
- lib/javassist-3.20.0-GA.jar,
- lib/javax.el-2.2.6.jar,
- lib/javax.el-api-2.2.5.jar,
- lib/javax.servlet-api-3.1.0.jar,
- lib/jaxb-api-2.2.12.jar,
- lib/jaxb-core-2.2.11.jar,
- lib/jaxb-jxc-2.2.11.jar,
- lib/jaxb-runtime-2.2.11.jar,
- lib/jaxb-xjc-2.2.11.jar,
- lib/jaxb1-impl-2.2-EA.jar,
- lib/jaxen-1.1.4.jar,
- lib/jaxen-1.1.6.jar,
lib/jboss-logging-3.3.0.Final.jar,
- lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,
- lib/jcl-over-slf4j-1.7.6.jar,
- lib/jdbc4-2.0.jar,
lib/jdom-1.1.3.jar,
lib/jdom2-2.0.6.jar,
- lib/jena-arq-2.13.0.jar,
- lib/jena-core-2.13.0.jar,
- lib/jena-iri-1.1.2.jar,
- lib/jena-tdb-1.1.2.jar,
lib/joda-time-2.9.1.jar,
- lib/json-20090211.jar,
- lib/json-lib-2.4-jdk15.jar,
- lib/jsonld-java-0.5.1.jar,
- lib/jsr250-api-1.0.jar,
- lib/jta-1.1.jar,
- lib/jtds-1.3.1.jar,
- lib/junit-4.12.jar,
- lib/junit-benchmarks-0.7.2.jar,
- lib/libthrift-0.9.2.jar,
lib/log4j-1.2.17.jar,
lib/lsid-client-1.1.2.jar,
- lib/lsid-server-1.1.2.jar,
- lib/lucene-analyzers-common-5.4.1.jar,
- lib/lucene-backward-codecs-5.4.1.jar,
- lib/lucene-core-5.4.1.jar,
- lib/lucene-facet-5.4.1.jar,
- lib/lucene-grouping-5.4.1.jar,
- lib/lucene-highlighter-5.4.1.jar,
- lib/lucene-join-5.4.1.jar,
- lib/lucene-memory-5.4.1.jar,
- lib/lucene-misc-5.4.1.jar,
- lib/lucene-queries-5.4.1.jar,
- lib/lucene-queryparser-5.4.1.jar,
- lib/lucene-sandbox-5.4.1.jar,
- lib/lucene-suggest-5.4.1.jar,
- lib/mapstruct-1.0.0.Final.jar,
- lib/mchange-commons-java-0.2.11.jar,
- lib/mysql-connector-java-5.1.38.jar,
- lib/objenesis-1.2.jar,
- lib/odfdom-0.8.jar,
- lib/odfdom-java-0.8.7.jar,
- lib/ognl-2.6.9.jar,
- lib/opencsv-2.3.jar,
- lib/paranamer-2.3.jar,
- lib/poi-3.13.jar,
- lib/poi-ooxml-3.13.jar,
- lib/poi-ooxml-schemas-3.13.jar,
- lib/postgresql-9.4-1206-jdbc4.jar,
- lib/relaxngDatatype-20020414.jar,
- lib/rngom-2.2.11.jar,
lib/sanselan-0.97-incubator.jar,
- lib/Saxon-HE-9.7.0-2.jar,
- lib/servlet-api-2.5.jar,
- lib/slf4j-api-1.7.13.jar,
- lib/slf4j-log4j12-1.7.13.jar,
- lib/slf4j-nop-1.7.13.jar,
- lib/snappy-java-1.0.4.1.jar,
- lib/solr-analysis-extras-3.6.2.jar,
- lib/solr-core-3.6.2.jar,
- lib/solr-solrj-3.6.2.jar,
lib/spring-aop-4.2.4.RELEASE.jar,
lib/spring-aspects-4.2.4.RELEASE.jar,
lib/spring-beans-4.2.4.RELEASE.jar,
@@ -710,15 +627,6 @@ Bundle-ClassPath: .,
lib/standard-1.1.2.jar,
lib/tools.jar,
lib/txw2-2.2.11.jar,
- lib/unitils-core-3.4.2.jar,
- lib/unitils-database-3.4.2.jar,
- lib/unitils-dbmaintainer-3.4.2.jar,
- lib/unitils-dbunit-3.4.2.jar,
- lib/unitils-easymock-3.4.2.jar,
- lib/unitils-inject-3.4.2.jar,
- lib/unitils-mock-3.4.2.jar,
- lib/unitils-orm-3.4.2.jar,
- lib/unitils-spring-3.4.2.jar,
lib/usertype.jodatime-2.0.1.jar,
lib/usertype.spi-2.0.1.jar,
lib/validation-api-1.1.0.Final.jar,
@@ -738,5 +646,38 @@ Bundle-ClassPath: .,
lib/xsom-20140925.jar,
lib/xstream-1.4.8.jar,
lib/yjp-controller-api-redist-9.0.8.jar,
- lib/spring-security-oauth2-2.0.11.RELEASE.jar
+ lib/spring-security-oauth2-2.0.11.RELEASE.jar,
+ lib/opencsv-2.3.jar,
+ lib/jdbc4-2.0.jar,
+ lib/junit-4.12.jar,
+ lib/jackson-databind-2.6.5.jar,
+ lib/jackson-core-asl-1.8.8.jar,
+ lib/jackson-mapper-asl-1.8.8.jar,
+ lib/jakarta-regexp-1.4.jar,
+ lib/jandex-2.0.0.Final.jar,
+ lib/javassist-3.20.0-GA.jar,
+ lib/javax.el-2.2.6.jar,
+ lib/javax.el-api-2.2.5.jar,
+ lib/javax.servlet-api-3.1.0.jar,
+ lib/jaxb-api-2.2.12.jar,
+ lib/jaxb-core-2.2.11.jar,
+ lib/jaxb-jxc-2.2.11.jar,
+ lib/jaxb-runtime-2.2.11.jar,
+ lib/jaxb-xjc-2.2.11.jar,
+ lib/jaxb1-impl-2.2-EA.jar,
+ lib/jaxen-1.1.4.jar,
+ lib/jaxen-1.1.6.jar,
+ lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,
+ lib/jcl-over-slf4j-1.7.6.jar,
+ lib/jena-arq-2.13.0.jar,
+ lib/jena-core-2.13.0.jar,
+ lib/jena-iri-1.1.2.jar,
+ lib/jena-tdb-1.1.2.jar,
+ lib/json-20090211.jar,
+ lib/json-lib-2.4-jdk15.jar,
+ lib/jsonld-java-0.5.1.jar,
+ lib/jsr250-api-1.0.jar,
+ lib/jta-1.1.jar,
+ lib/jtds-1.3.1.jar,
+ lib/junit-benchmarks-0.7.2.jar
Import-Package: eu.etaxonomy.cdm.api.application
diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index dd8f1fd39..224b76d19 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -90,84 +90,13 @@ bin.includes = META-INF/,\
lib/itextpdf-5.5.8.jar,\
lib/jackson-annotations-2.6.5.jar,\
lib/jackson-core-2.6.5.jar,\
- lib/jackson-core-asl-1.8.8.jar,\
- lib/jackson-databind-2.6.5.jar,\
- lib/jackson-mapper-asl-1.8.8.jar,\
- lib/jakarta-regexp-1.4.jar,\
- lib/jandex-2.0.0.Final.jar,\
- lib/javassist-3.20.0-GA.jar,\
- lib/javax.el-2.2.6.jar,\
- lib/javax.el-api-2.2.5.jar,\
- lib/javax.servlet-api-3.1.0.jar,\
- lib/jaxb-api-2.2.12.jar,\
- lib/jaxb-core-2.2.11.jar,\
- lib/jaxb-jxc-2.2.11.jar,\
- lib/jaxb-runtime-2.2.11.jar,\
- lib/jaxb-xjc-2.2.11.jar,\
- lib/jaxb1-impl-2.2-EA.jar,\
- lib/jaxen-1.1.4.jar,\
- lib/jaxen-1.1.6.jar,\
lib/jboss-logging-3.3.0.Final.jar,\
- lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,\
- lib/jcl-over-slf4j-1.7.6.jar,\
- lib/jdbc4-2.0.jar,\
lib/jdom-1.1.3.jar,\
lib/jdom2-2.0.6.jar,\
- lib/jena-arq-2.13.0.jar,\
- lib/jena-core-2.13.0.jar,\
- lib/jena-iri-1.1.2.jar,\
- lib/jena-tdb-1.1.2.jar,\
lib/joda-time-2.9.1.jar,\
- lib/json-20090211.jar,\
- lib/json-lib-2.4-jdk15.jar,\
- lib/jsonld-java-0.5.1.jar,\
- lib/jsr250-api-1.0.jar,\
- lib/jta-1.1.jar,\
- lib/jtds-1.3.1.jar,\
- lib/junit-4.12.jar,\
- lib/junit-benchmarks-0.7.2.jar,\
- lib/libthrift-0.9.2.jar,\
lib/log4j-1.2.17.jar,\
lib/lsid-client-1.1.2.jar,\
- lib/lsid-server-1.1.2.jar,\
- lib/lucene-analyzers-common-5.4.1.jar,\
- lib/lucene-backward-codecs-5.4.1.jar,\
- lib/lucene-core-5.4.1.jar,\
- lib/lucene-facet-5.4.1.jar,\
- lib/lucene-grouping-5.4.1.jar,\
- lib/lucene-highlighter-5.4.1.jar,\
- lib/lucene-join-5.4.1.jar,\
- lib/lucene-memory-5.4.1.jar,\
- lib/lucene-misc-5.4.1.jar,\
- lib/lucene-queries-5.4.1.jar,\
- lib/lucene-queryparser-5.4.1.jar,\
- lib/lucene-sandbox-5.4.1.jar,\
- lib/lucene-suggest-5.4.1.jar,\
- lib/mapstruct-1.0.0.Final.jar,\
- lib/mchange-commons-java-0.2.11.jar,\
- lib/mysql-connector-java-5.1.38.jar,\
- lib/objenesis-1.2.jar,\
- lib/odfdom-0.8.jar,\
- lib/odfdom-java-0.8.7.jar,\
- lib/ognl-2.6.9.jar,\
- lib/opencsv-2.3.jar,\
- lib/paranamer-2.3.jar,\
- lib/poi-3.13.jar,\
- lib/poi-ooxml-3.13.jar,\
- lib/poi-ooxml-schemas-3.13.jar,\
- lib/postgresql-9.4-1206-jdbc4.jar,\
- lib/relaxngDatatype-20020414.jar,\
- lib/rngom-2.2.11.jar,\
lib/sanselan-0.97-incubator.jar,\
- lib/Saxon-HE-9.7.0-2.jar,\
- lib/servlet-api-2.5.jar,\
- lib/slf4j-api-1.7.13.jar,\
- lib/slf4j-log4j12-1.7.13.jar,\
- lib/slf4j-nop-1.7.13.jar,\
- lib/snappy-java-1.0.4.1.jar,\
- lib/solr-analysis-extras-3.6.2.jar,\
- lib/solr-core-3.6.2.jar,\
- lib/solr-solrj-3.6.2.jar,\
lib/spring-aop-4.2.4.RELEASE.jar,\
lib/spring-aspects-4.2.4.RELEASE.jar,\
lib/spring-beans-4.2.4.RELEASE.jar,\
@@ -197,15 +126,6 @@ bin.includes = META-INF/,\
lib/standard-1.1.2.jar,\
lib/tools.jar,\
lib/txw2-2.2.11.jar,\
- lib/unitils-core-3.4.2.jar,\
- lib/unitils-database-3.4.2.jar,\
- lib/unitils-dbmaintainer-3.4.2.jar,\
- lib/unitils-dbunit-3.4.2.jar,\
- lib/unitils-easymock-3.4.2.jar,\
- lib/unitils-inject-3.4.2.jar,\
- lib/unitils-mock-3.4.2.jar,\
- lib/unitils-orm-3.4.2.jar,\
- lib/unitils-spring-3.4.2.jar,\
lib/usertype.jodatime-2.0.1.jar,\
lib/usertype.spi-2.0.1.jar,\
lib/validation-api-1.1.0.Final.jar,\
@@ -225,7 +145,40 @@ bin.includes = META-INF/,\
lib/xsom-20140925.jar,\
lib/xstream-1.4.8.jar,\
lib/yjp-controller-api-redist-9.0.8.jar,\
- lib/spring-security-oauth2-2.0.11.RELEASE.jar
+ lib/spring-security-oauth2-2.0.11.RELEASE.jar,\
+ lib/opencsv-2.3.jar,\
+ lib/jdbc4-2.0.jar,\
+ lib/junit-4.12.jar,\
+ lib/jackson-databind-2.6.5.jar,\
+ lib/jackson-core-asl-1.8.8.jar,\
+ lib/jackson-mapper-asl-1.8.8.jar,\
+ lib/jakarta-regexp-1.4.jar,\
+ lib/jandex-2.0.0.Final.jar,\
+ lib/javassist-3.20.0-GA.jar,\
+ lib/javax.el-2.2.6.jar,\
+ lib/javax.el-api-2.2.5.jar,\
+ lib/javax.servlet-api-3.1.0.jar,\
+ lib/jaxb-api-2.2.12.jar,\
+ lib/jaxb-core-2.2.11.jar,\
+ lib/jaxb-jxc-2.2.11.jar,\
+ lib/jaxb-runtime-2.2.11.jar,\
+ lib/jaxb-xjc-2.2.11.jar,\
+ lib/jaxb1-impl-2.2-EA.jar,\
+ lib/jaxen-1.1.4.jar,\
+ lib/jaxen-1.1.6.jar,\
+ lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,\
+ lib/jcl-over-slf4j-1.7.6.jar,\
+ lib/jena-arq-2.13.0.jar,\
+ lib/jena-core-2.13.0.jar,\
+ lib/jena-iri-1.1.2.jar,\
+ lib/jena-tdb-1.1.2.jar,\
+ lib/json-20090211.jar,\
+ lib/json-lib-2.4-jdk15.jar,\
+ lib/jsonld-java-0.5.1.jar,\
+ lib/jsr250-api-1.0.jar,\
+ lib/jta-1.1.jar,\
+ lib/jtds-1.3.1.jar,\
+ lib/junit-benchmarks-0.7.2.jar
jars.compile.order = .
output.. = bin/