diff --git a/jdbc-handler/pom.xml b/jdbc-handler/pom.xml index ad421a15ec..8bc9bba91d 100644 --- a/jdbc-handler/pom.xml +++ b/jdbc-handler/pom.xml @@ -87,9 +87,9 @@ - commons-dbcp - commons-dbcp - ${commons-dbcp.version} + org.apache.commons + commons-dbcp2 + ${commons-dbcp2.version} diff --git a/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/JdbcStorageHandler.java b/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/JdbcStorageHandler.java index d8c54334c7..7fe63b4a97 100644 --- a/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/JdbcStorageHandler.java +++ b/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/JdbcStorageHandler.java @@ -129,8 +129,8 @@ public void configureJobConf(TableDesc tableDesc, JobConf jobConf) { List> classesToLoad = new ArrayList<>(); classesToLoad.add(org.apache.hive.storage.jdbc.JdbcInputSplit.class); - classesToLoad.add(org.apache.commons.dbcp.BasicDataSourceFactory.class); - classesToLoad.add(org.apache.commons.pool.impl.GenericObjectPool.class); + classesToLoad.add(org.apache.commons.dbcp2.BasicDataSourceFactory.class); + classesToLoad.add(org.apache.commons.pool2.impl.GenericObjectPool.class); // Adding mysql jdbc driver if exists try { classesToLoad.add(Class.forName("com.mysql.jdbc.Driver")); diff --git a/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/dao/GenericJdbcDatabaseAccessor.java b/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/dao/GenericJdbcDatabaseAccessor.java index 79c16df575..c2e7473e40 100644 --- a/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/dao/GenericJdbcDatabaseAccessor.java +++ b/jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/dao/GenericJdbcDatabaseAccessor.java @@ -15,17 +15,12 @@ package org.apache.hive.storage.jdbc.dao; import com.google.common.base.Preconditions; -import org.apache.commons.dbcp.BasicDataSourceFactory; +import org.apache.commons.dbcp2.BasicDataSourceFactory; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.Constants; import org.apache.hadoop.hive.ql.exec.Utilities; -import org.apache.hadoop.hive.serde.serdeConstants; -import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; -import org.apache.hadoop.io.Text; -import org.apache.hadoop.security.Credentials; -import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +36,6 @@ import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; -import java.sql.Types; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/pom.xml b/pom.xml index 23c441304a..93a3aadebb 100644 --- a/pom.xml +++ b/pom.xml @@ -142,6 +142,8 @@ 3.2 1.5.4 1.4 + 2.6.1 + 2.6.0 10.14.1.0 3.1.0 0.1.2