From: Andreas Müller <a.mueller@bgbm.org>
Date: Mon, 19 Sep 2016 19:50:47 +0000 (+0200)
Subject: ref #6082 try to fix dependency issues in managed TaxEditor
X-Git-Tag: 4.3.0^2~9
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/ccf3875f14f8a66ddd42a95a8bda285d6600dd54

ref #6082 try to fix dependency issues in managed TaxEditor
---

diff --git a/eu.etaxonomy.taxeditor.webapp/.classpath b/eu.etaxonomy.taxeditor.webapp/.classpath
index 87c7de086..03d1c3ee4 100644
--- a/eu.etaxonomy.taxeditor.webapp/.classpath
+++ b/eu.etaxonomy.taxeditor.webapp/.classpath
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/postgresql-9.4-1206-jdbc4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.38.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/h2-1.4.190.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.11.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.24.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jetty-all-9.2.9.v20150224.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
diff --git a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
index 3b8258653..33a73b718 100644
--- a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
@@ -11,10 +11,12 @@ Bundle-ClassPath: .,
  lib/log4j-1.2.17.jar,
  lib/jetty-all-9.2.9.v20150224.jar,
  lib/javax.servlet-api-3.1.0.jar,
- lib/mysql-connector-java-5.1.24.jar,
  lib/c3p0-0.9.5.2.jar,
  lib/h2-1.4.190.jar,
- lib/mchange-commons-java-0.2.11.jar
+ lib/mchange-commons-java-0.2.11.jar,
+ lib/mysql-connector-java-5.1.38.jar,
+ lib/postgresql-9.4-1206-jdbc4.jar,
+ lib/jdbc4-2.0.jar
 Bundle-Vendor: EDIT
 Import-Package: org.eclipse.jface.resource,
  org.eclipse.ui.plugin
diff --git a/eu.etaxonomy.taxeditor.webapp/build.properties b/eu.etaxonomy.taxeditor.webapp/build.properties
index 7e988e36f..a5a7a9f2d 100644
--- a/eu.etaxonomy.taxeditor.webapp/build.properties
+++ b/eu.etaxonomy.taxeditor.webapp/build.properties
@@ -2,4 +2,9 @@ source.. = src/main/java/,\
            src/main/resources/           
 bin.includes = META-INF/,\
                .,\
-               lib/
+               lib/,\
+               lib/h2-1.4.190.jar,\
+               lib/mchange-commons-java-0.2.11.jar,\
+               lib/mysql-connector-java-5.1.38.jar,\
+               lib/postgresql-9.4-1206-jdbc4.jar,\
+               lib/jdbc4-2.0.jar