From e30bded686425d5677769a9060861e3dfe909fe1 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 19 Mar 2013 13:31:55 +0800 Subject: [PATCH] IDEMPIERE-770 Upgrade c3p0 to 0.9.2 --- org.compiere.db.oracle.provider/.classpath | 5 +++-- org.compiere.db.oracle.provider/META-INF/MANIFEST.MF | 5 +++-- org.compiere.db.oracle.provider/build.properties | 7 ++++--- org.compiere.db.postgresql.provider/.classpath | 3 ++- org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF | 3 ++- org.compiere.db.postgresql.provider/build.properties | 5 +++-- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/org.compiere.db.oracle.provider/.classpath b/org.compiere.db.oracle.provider/.classpath index f3c0c812d2..c40f083e0a 100644 --- a/org.compiere.db.oracle.provider/.classpath +++ b/org.compiere.db.oracle.provider/.classpath @@ -1,10 +1,11 @@ + + + - - diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF index 5c6f1fa615..74c9f0972b 100644 --- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF @@ -8,8 +8,9 @@ Require-Bundle: org.adempiere.base;bundle-version="1.0.0", org.adempiere.install;bundle-version="1.0.0" Bundle-ClassPath: ., ojdbc6.jar, - c3p0-0.9.1.2.jar, - c3p0-oracle-thin-extras-0.9.1.2.jar + c3p0-0.9.2.jar, + c3p0-oracle-thin-extras-0.9.2.jar, + mchange-commons-java-0.2.3.3.jar Import-Package: org.osgi.framework Bundle-ActivationPolicy: lazy Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator diff --git a/org.compiere.db.oracle.provider/build.properties b/org.compiere.db.oracle.provider/build.properties index e60cf008a0..ff25cde9bf 100644 --- a/org.compiere.db.oracle.provider/build.properties +++ b/org.compiere.db.oracle.provider/build.properties @@ -3,8 +3,9 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ ojdbc6.jar,\ - c3p0-0.9.1.2.jar,\ - c3p0-oracle-thin-extras-0.9.1.2.jar,\ OSGI-INF/oracleprovider.xml,\ - OSGI-INF/ + OSGI-INF/,\ + c3p0-0.9.2.jar,\ + c3p0-oracle-thin-extras-0.9.2.jar,\ + mchange-commons-java-0.2.3.3.jar source.. = src/ diff --git a/org.compiere.db.postgresql.provider/.classpath b/org.compiere.db.postgresql.provider/.classpath index 122d279ee0..43c2129426 100644 --- a/org.compiere.db.postgresql.provider/.classpath +++ b/org.compiere.db.postgresql.provider/.classpath @@ -1,9 +1,10 @@ + + - diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF index bc054b4408..4f854e554b 100644 --- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF @@ -6,7 +6,8 @@ Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., postgresql.jar, - c3p0-0.9.1.2.jar + c3p0-0.9.2.jar, + mchange-commons-java-0.2.3.3.jar Require-Bundle: org.adempiere.base;bundle-version="1.0.0", org.adempiere.install;bundle-version="1.0.0" Import-Package: junit.framework;version="3.8.2", diff --git a/org.compiere.db.postgresql.provider/build.properties b/org.compiere.db.postgresql.provider/build.properties index d6c1b01288..2c8cc3b20a 100644 --- a/org.compiere.db.postgresql.provider/build.properties +++ b/org.compiere.db.postgresql.provider/build.properties @@ -3,7 +3,8 @@ bin.includes = META-INF/,\ .,\ postgresql.jar,\ plugin.xml,\ - c3p0-0.9.1.2.jar,\ OSGI-INF/pgprovider.xml,\ - OSGI-INF/ + OSGI-INF/,\ + c3p0-0.9.2.jar,\ + mchange-commons-java-0.2.3.3.jar source.. = src/