ref #8118 Update/remove mysqlconnector dependency

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 34ceda15e8cfdfb8914eaeb0963a5a6dc0870816..0447c5e46e8b6e3f7248f7f19d23dea1429dd0fd 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -875,5 +875,6 @@ 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-6.0.1.jar
+ lib/docx4j-6.0.1.jar,
+ lib/mysql-connector-java-8.0.15.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 e987d282fd5b4ae41dba6d5c57a333dc2243b330..1411019abc27287dbf4e4f6d6ed676c03b05a046 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -225,7 +225,8 @@ 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-6.0.1.jar
+               lib/docx4j-6.0.1.jar,\
+               lib/mysql-connector-java-8.0.15.jar
 
 jars.compile.order = .
 output.. = bin/

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar
deleted file mode 100644 (file)
index be09493..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.38.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-8.0.15.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-8.0.15.jar
new file mode 100644 (file)
index 0000000..fa0979f
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-8.0.15.jar differ