Revert "remove mysql-connector-java from taxeditor-cdmlib" and use latest mysql-conne...

This reverts commit 439eb660e3682cbdd4dafbeed7dd81ef52e6f326.

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 1400c8591af3eeaf1dc1ab82ba60940f32caa29d..b3dd54ba5be30a8b15f86afab066a9ebeaa3f60f 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -786,6 +786,7 @@ Bundle-ClassPath: .,
  lib/org.swtchart_0.10.0.v20160212.jar,
  lib/commons-math3-3.6.1.jar,
  lib/docx4j-6.0.1.jar,
+ lib/mysql-connector-java-8.0.20.jar,
  lib/httpclient-4.5.11.jar,
  lib/httpclient-cache-4.2.6.jar,
  lib/httpcore-4.4.13.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 57aea803681224787338ca8aefa3158443462297..5b8ee1cfea8b29d88686bac029bb5378a7dbdc3b 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -188,6 +188,7 @@ bin.includes = META-INF/,\
                lib/org.swtchart_0.10.0.v20160212.jar,\
                lib/commons-math3-3.6.1.jar,\
                lib/docx4j-6.0.1.jar,\
+               lib/mysql-connector-java-8.0.20.jar,\
                lib/JavaAPIforKml-2.2.1.jar,\
                lib/iiif-apis-0.3.7.jar
 

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

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 50801937713bed5fe2bbeee790a567a9a27bbcc9..66058cd60924747cfa16c77c89580408da34dd14 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -73,6 +73,7 @@
             <configuration>\r
               <includeArtifactIds>\r
                 httpclient-cache,httpcore,httpmime\r
+<!--                 c3p0,mchange-commons-java,h2,postgresql,mysql-connector-java,jdbc4 -->\r
               </includeArtifactIds>\r
               <outputDirectory>\r
                 ${basedir}/lib\r