Revert "commons-dbcp2 -> tomcat-jdbc"

This reverts commit a0fba35796e6dfb1188d716985e1d483bf1098c4.

1 files changed, 3 insertions, 3 deletions

diff --git a/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java b/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
index c4c77b40..394e7639 100644
--- a/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
+++ b/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
@@ -18,6 +18,7 @@
 package com.juick.configuration;
 
 import com.juick.service.search.SearchService;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.*;
 import org.springframework.core.env.Environment;
@@ -28,7 +29,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.TransactionManagementConfigurer;
 
 import javax.annotation.Resource;
-import javax.sql.DataSource;
 import java.util.Collections;
 import java.util.List;
 
@@ -46,8 +46,8 @@ public class DataConfiguration implements TransactionManagementConfigurer {
     // NOTE: The close() method will be called automatically with default @Bean settings
     // But Datasource interface has no close() method
     @Bean
-    public DataSource dataSource() {
-        org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource();
+    public BasicDataSource dataSource() {
+        BasicDataSource dataSource = new BasicDataSource();
 
         dataSource.setDriverClassName(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
         dataSource.setUrl(env.getProperty("datasource_url"));