ref #9204 remove docx4j and dependencies from taxeditor.cdmlib

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 3bb39ce5d159aeaad6b76e2af867b870662c3868..e95ebc9d0da5b682663b9633596669033a9399af 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -621,14 +621,12 @@ Bundle-ClassPath: .,
  lib/xercesImpl-2.12.0.jar,
  lib/xml-apis-1.4.01.jar,
  lib/xmlbeans-3.1.0.jar,
- lib/xmlgraphics-commons-1.5.jar,
  lib/opencsv-2.3.jar,
  lib/junit-4.13.jar,
  lib/javassist-3.27.0-GA.jar,
  lib/javax.el-api-3.0.0.jar,
  lib/javax.activation-api-1.2.0.jar,
  lib/jaxb-api-2.3.1.jar,
- lib/jcl-over-slf4j-1.7.6.jar,
  lib/json-20090211.jar,
  lib/json-lib-2.4-jdk15.jar,
  lib/slf4j-api-1.7.30.jar,
@@ -655,7 +653,6 @@ Bundle-ClassPath: .,
  lib/org.swtchart_0.10.0.v20160212.jar,
  lib/commons-collections4-4.4.jar,
  lib/commons-math3-3.6.1.jar,
- lib/docx4j-6.0.1.jar,
  lib/mysql-connector-java-8.0.21.jar,
  lib/httpclient-4.5.12.jar,
  lib/httpclient-cache-4.2.6.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/README.txt b/eu.etaxonomy.taxeditor.cdmlib/README.txt
index a847b306f3fb0d796bc56a8d68de9bbacee36920..13228ad10ab67d77c175ab0c1d7068f02234ca02 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/README.txt
+++ b/eu.etaxonomy.taxeditor.cdmlib/README.txt
@@ -35,14 +35,6 @@ Normal Dependencies
     
     Apache License v2.0
 
-- Apache XML Graphics Commons
-
-    xmlgraphics-commons-*.jar
-    http://xmlgraphics.apache.org/
-    (Common Library for Apache Batik and Apache FOP)
-    
-    Apache License v2.0
-
 - Apache Batik
 
     batik-*.jar

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 8777cf9748a6d10232da114ef69d188d6a203faa..ad52b3266ab6111c387051175d0997846aaeb8dd 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -68,14 +68,12 @@ bin.includes = META-INF/,\
                lib/xercesImpl-2.12.0.jar,\
                lib/xml-apis-1.4.01.jar,\
                lib/xmlbeans-3.1.0.jar,\
-               lib/xmlgraphics-commons-1.5.jar,\
                lib/opencsv-2.3.jar,\
                lib/junit-4.13.jar,\
                lib/javassist-3.27.0-GA.jar,\
                lib/javax.el-api-3.0.0.jar,\
                lib/javax.activation-api-1.2.0.jar,\
                lib/jaxb-api-2.3.1.jar,\
-               lib/jcl-over-slf4j-1.7.6.jar,\
                lib/json-20090211.jar,\
                lib/json-lib-2.4-jdk15.jar,\
                lib/slf4j-api-1.7.30.jar,\
@@ -103,7 +101,6 @@ bin.includes = META-INF/,\
                lib/org.swtchart_0.10.0.v20160212.jar,\
                lib/commons-collections4-4.4.jar,\
                lib/commons-math3-3.6.1.jar,\
-               lib/docx4j-6.0.1.jar,\
                lib/mysql-connector-java-8.0.21.jar,\
                lib/JavaAPIforKml-2.2.1.jar,\
                lib/iiif-apis-0.3.7.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/docx4j-6.0.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/docx4j-6.0.1.jar
deleted file mode 100644 (file)
index 5e193bb..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/docx4j-6.0.1.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar
deleted file mode 100644 (file)
index 1a1ceee..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jcl-over-slf4j-1.7.6.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.5.jar
deleted file mode 100644 (file)
index 0ff3b4f..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.5.jar and /dev/null differ