Issue #2908 Update org.apache.commons.pool to 1.5.4. Change GeoTools to use the separate org.apache.commons projects that are in the baseline.

Change-Id: I05de2eaadc2766a8a0deee6ac816f29119800774

Former-commit-id: 107daf22ae [formerly 0a6630a84d [formerly 60ace911a0b1496d3bb74a85ff3c6b89ca70c267]]
Former-commit-id: 0a6630a84d
Former-commit-id: ef8a3b2581
This commit is contained in:
Ron Anderson 2014-03-13 18:01:22 -05:00
parent 06fa63341d
commit 3ac978316a
12 changed files with 9 additions and 16 deletions

View file

@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="commons-pool-1.3.jar" sourcepath="org.apache.commons.poolsrc.zip"/>
<classpathentry exported="true" kind="lib" path="commons-pool-1.5.4.jar" sourcepath="commons-pool-1.5.4-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

View file

@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Pool Plug-in
Bundle-SymbolicName: org.apache.commons.pool
Bundle-Version: 1.3.0
Bundle-ClassPath: commons-pool-1.3.jar
Bundle-Version: 1.5.4
Bundle-ClassPath: commons-pool-1.5.4.jar
Export-Package: org.apache.commons.pool,
org.apache.commons.pool.impl
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

View file

@ -1,2 +1,2 @@
bin.includes = META-INF/,\
commons-pool-1.3.jar
commons-pool-1.5.4.jar

View file

@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="lib" path="common-2.6.0.jar"/>
<classpathentry kind="lib" path="commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="commons-collections-3.1.jar"/>
<classpathentry kind="lib" path="commons-dbcp-1.3.jar"/>
<classpathentry kind="lib" path="commons-jxpath-1.3.jar"/>
<classpathentry kind="lib" path="commons-lang-2.3.jar"/>
<classpathentry kind="lib" path="commons-pool-1.5.4.jar"/>
<classpathentry exported="true" kind="lib" path="ecore-2.6.1.jar"/>
<classpathentry exported="true" kind="lib" path="gt-api-10.5.jar" sourcepath="geotools-source-10.5.zip"/>
<classpathentry exported="true" kind="lib" path="gt-coverage-10.5.jar" sourcepath="geotools-source-10.5.zip"/>

View file

@ -4,11 +4,8 @@ Bundle-Name: Geotools Plug-in
Bundle-SymbolicName: org.geotools
Bundle-Version: 10.5
Bundle-ClassPath: common-2.6.0.jar,
commons-beanutils-1.7.0.jar,
commons-collections-3.1.jar,
commons-dbcp-1.3.jar,
commons-jxpath-1.3.jar,
commons-lang-2.3.jar,
commons-pool-1.5.4.jar,
ecore-2.6.1.jar,
gt-api-10.5.jar,
@ -305,7 +302,11 @@ Export-Package: com.vividsolutions.jts,
Require-Bundle: javax.vecmath;bundle-version="1.3.1",
javax.measure;bundle-version="1.0.0",
org.postgres;bundle-version="1.0.0",
org.slf4j;bundle-version="1.7.5"
org.slf4j;bundle-version="1.7.5",
org.apache.commons.beanutils;bundle-version="1.8.3",
org.apache.commons.collections;bundle-version="3.2.0",
org.apache.commons.lang;bundle-version="2.3.0",
org.apache.commons.pool;bundle-version="1.5.4"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-BuddyPolicy: registered, ext, global
Bundle-ActivationPolicy: lazy

View file

@ -1,12 +1,8 @@
bin.includes = META-INF/,\
.,\
common-2.6.0.jar,\
commons-beanutils-1.7.0.jar,\
commons-collections-3.1.jar,\
commons-dbcp-1.3.jar,\
commons-jxpath-1.3.jar,\
commons-lang-2.3.jar,\
commons-pool-1.5.4.jar,\
ecore-2.6.1.jar,\
gt-api-10.5.jar,\
gt-coverage-10.5.jar,\