From f9ebd779d430a83f90192f1199fcd967bc737774 Mon Sep 17 00:00:00 2001 From: Andreas Kohlbecker Date: Thu, 18 Feb 2016 12:56:57 +0100 Subject: [PATCH] adding c3p0-0.9.5.2.jar to MANIFEST.MF instead of pom.xml dependency --- eu.etaxonomy.taxeditor.webapp/.classpath | 1 + eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF | 3 ++- eu.etaxonomy.taxeditor.webapp/build.properties | 3 ++- eu.etaxonomy.taxeditor.webapp/pom.xml | 8 -------- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/eu.etaxonomy.taxeditor.webapp/.classpath b/eu.etaxonomy.taxeditor.webapp/.classpath index e932ef589..d162d85a2 100644 --- a/eu.etaxonomy.taxeditor.webapp/.classpath +++ b/eu.etaxonomy.taxeditor.webapp/.classpath @@ -1,5 +1,6 @@ + diff --git a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF index 19cd2a23c..25f8c4122 100644 --- a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF @@ -11,7 +11,8 @@ 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/mysql-connector-java-5.1.24.jar, + lib/c3p0-0.9.5.2.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 4ff6758de..ca2dc6a58 100644 --- a/eu.etaxonomy.taxeditor.webapp/build.properties +++ b/eu.etaxonomy.taxeditor.webapp/build.properties @@ -6,4 +6,5 @@ bin.includes = META-INF/,\ 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/cdmlib-remote-webapp.war + lib/cdmlib-remote-webapp.war,\ + lib/c3p0-0.9.5.2.jar diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.webapp/pom.xml index 981a3daa2..599000551 100644 --- a/eu.etaxonomy.taxeditor.webapp/pom.xml +++ b/eu.etaxonomy.taxeditor.webapp/pom.xml @@ -105,14 +105,6 @@ ${cdmlib.version} war - - - eu.etaxonomy - cdmlib-persistence - ${cdmlib.version} - -- 2.34.1