Repository: calcite Updated Branches: refs/heads/master 8a91c8dd4 -> 184bb1857
[CALCITE-2388] Upgrade from commons-dbcp to commons-dbcp2 version 2.4.0 Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/f2587064 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/f2587064 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/f2587064 Branch: refs/heads/master Commit: f258706467a480cf3f6083748690b10640d0e8eb Parents: 8a91c8d Author: Julian Hyde <[email protected]> Authored: Thu Jun 28 17:54:25 2018 -0700 Committer: Julian Hyde <[email protected]> Committed: Thu Jun 28 18:07:43 2018 -0700 ---------------------------------------------------------------------- core/pom.xml | 8 ++++++-- .../org/apache/calcite/adapter/jdbc/JdbcUtils.java | 2 +- pom.xml | 14 ++++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/f2587064/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 811df7e..3697345 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -52,14 +52,18 @@ limitations under the License. </dependency> <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-dbcp2</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-pool2</artifactId> + </dependency> + <dependency> <groupId>com.esri.geometry</groupId> <artifactId>esri-geometry-api</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/calcite/blob/f2587064/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcUtils.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcUtils.java index 0fe1761..113b88a 100644 --- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcUtils.java +++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcUtils.java @@ -25,7 +25,7 @@ import org.apache.calcite.sql.SqlDialectFactory; import org.apache.calcite.util.ImmutableNullableList; import org.apache.calcite.util.Pair; -import org.apache.commons.dbcp.BasicDataSource; +import org.apache.commons.dbcp2.BasicDataSource; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; http://git-wip-us.apache.org/repos/asf/calcite/blob/f2587064/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7b76080..a53a13e 100644 --- a/pom.xml +++ b/pom.xml @@ -63,9 +63,10 @@ limitations under the License. <cassandra-driver-core.version>3.4.0</cassandra-driver-core.version> <checksum-maven-plugin.version>1.2</checksum-maven-plugin.version> <chinook-data-hsqldb.version>0.1</chinook-data-hsqldb.version> - <commons-dbcp.version>1.4</commons-dbcp.version> + <commons-dbcp2.version>2.4.0</commons-dbcp2.version> <commons-lang3.version>3.2</commons-lang3.version> <commons-logging.version>1.1.3</commons-logging.version> + <commons-pool2.version>2.5.0</commons-pool2.version> <elasticsearch-java-driver.version>2.4.6</elasticsearch-java-driver.version> <elasticsearch5-java-driver.version>5.6.9</elasticsearch5-java-driver.version> <esri-geometry-api.version>2.0.0</esri-geometry-api.version> @@ -216,9 +217,14 @@ limitations under the License. <!-- Now third-party dependencies, sorted by groupId and artifactId. --> <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>${commons-dbcp.version}</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-dbcp2</artifactId> + <version>${commons-dbcp2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-pool2</artifactId> + <version>${commons-pool2.version}</version> </dependency> <dependency> <groupId>com.carrotsearch</groupId>
