From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Thu, 29 Nov 2018 07:53:43 +0000 (+0100)
Subject: ref #7837 Update docx4j version
X-Git-Tag: 5.5.0^2~292
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/16a5a5e52fc33f645da1f5a10cf690b7a104c58c?ds=sidebyside

ref #7837 Update docx4j version
---

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index dedddb5ed..a85ad619b 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/docx4j-3.3.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/docx4j-6.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-math3-3.6.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.swtchart_0.10.0.v20160212.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/redmine-java-api-3.1.0.jar"/>
diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index eb8c8a337..0a042f16d 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -875,5 +875,5 @@ Bundle-ClassPath: .,
  lib/redmine-java-api-3.1.0.jar,
  lib/org.swtchart_0.10.0.v20160212.jar,
  lib/commons-math3-3.6.1.jar,
- lib/docx4j-3.3.5.jar
+ lib/docx4j-6.0.1.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 9cc61fac8..0c281dfe6 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -225,7 +225,7 @@ bin.includes = META-INF/,\
                lib/redmine-java-api-3.1.0.jar,\
                lib/org.swtchart_0.10.0.v20160212.jar,\
                lib/commons-math3-3.6.1.jar,\
-               lib/docx4j-3.3.5.jar
+               lib/docx4j-6.0.1.jar
 
 jars.compile.order = .
 output.. = bin/
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/docx4j-3.3.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/docx4j-3.3.5.jar
deleted file mode 100644
index 896a4a184..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/docx4j-3.3.5.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/docx4j-6.0.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/docx4j-6.0.1.jar
new file mode 100644
index 000000000..5e193bb97
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/docx4j-6.0.1.jar differ