Browse Source

依赖调整.

nieqiuqiu 5 years ago
parent
commit
e4f97d38e1

+ 0 - 3
build.gradle

@@ -60,11 +60,8 @@ ext {
         "junit-jupiter-engine"       : "org.junit.jupiter:junit-jupiter-engine:${junitVersion}",
         "fastjson"                   : "com.alibaba:fastjson:1.2.62",
         "jackson"                    : "com.fasterxml.jackson.core:jackson-databind:2.10.0",
-        "tomcatjdbc"                 : "org.apache.tomcat:tomcat-jdbc:9.0.16",
         "lagarto"                    : "org.jodd:jodd-lagarto:5.0.7",
         //datasource
-        "hikaricp"                   : "com.zaxxer:HikariCP:3.4.1",
-        "druid"                      : "com.alibaba:druid:1.1.20",
         "p6spy"                      : "p6spy:p6spy:3.8.6",
         "sqlserver"                  : "com.microsoft.sqlserver:sqljdbc4:4.0",
         "postgresql"                 : "org.postgresql:postgresql:9.4.1212",

+ 0 - 5
mybatis-plus-core/build.gradle

@@ -7,9 +7,4 @@ dependencies {
     implementation "${lib.cglib}"
     implementation "${lib.'spring-aop'}"
 
-    testCompile "${lib.aspectjweaver}"
-    testCompile "${lib.hikaricp}"
-    testCompile "${lib.druid}"
-    testCompile "${lib.fastjson}"
-    testCompile "${lib.tomcatjdbc}"
 }

+ 0 - 14
mybatis-plus-extension/build.gradle

@@ -13,18 +13,4 @@ dependencies {
     implementation("${lib["jackson"]}")
     implementation("${lib["fastjson"]}")
 
-    testImplementation("${lib["spring-web"]}")
-    testImplementation("${lib["javax.servlet-api"]}")
-    testImplementation("${lib["jackson"]}")
-    testImplementation("${lib["fastjson"]}")
-
-    testImplementation("${lib["hikaricp"]}")
-    testImplementation("${lib["druid"]}")
-    testImplementation("${lib["tomcatjdbc"]}")
-
-    testImplementation("${lib["h2"]}")
-    testImplementation("${lib["sqlserver"]}")
-    testImplementation("${lib["postgresql"]}")
-    testImplementation(lib["oracle"] as ConfigurableFileTree)
-    testImplementation("${lib["mysql"]}")
 }

+ 0 - 4
mybatis-plus/build.gradle

@@ -8,10 +8,6 @@ dependencies {
     testCompile "${lib.'spring-test'}"
     testCompile "${lib.fastjson}"
 
-    testCompile "${lib.hikaricp}"
-    testCompile "${lib.druid}"
-    testCompile "${lib.tomcatjdbc}"
-
     testCompile "${lib.h2}"
     testCompile "${lib.sqlserver}"
     testCompile "${lib.postgresql}"

+ 3 - 8
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/MybatisTest.java

@@ -15,8 +15,6 @@
  */
 package com.baomidou.mybatisplus.test;
 
-import com.alibaba.druid.pool.DruidDataSource;
-import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler;
@@ -29,7 +27,7 @@ import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.type.TypeHandlerRegistry;
-import org.h2.Driver;
+import org.h2.jdbcx.JdbcDataSource;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -51,12 +49,9 @@ class MybatisTest {
 
     @Test
     void test() throws IOException, SQLException {
-        DruidDataSource dataSource = new DruidDataSource();
-        dataSource.setDbType(DbType.H2.getDb());
-        dataSource.setDriver(new Driver());
-        dataSource.setUsername("sa");
+        JdbcDataSource dataSource = new JdbcDataSource();
+        dataSource.setUser("sa");
         dataSource.setPassword("");
-        dataSource.setValidationQuery("select 1");
         dataSource.setUrl("jdbc:h2:mem:test;MODE=mysql;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE");
         Reader reader = Resources.getResourceAsReader("mybatis-config.xml");
         SqlSessionFactory factory = new MybatisSqlSessionFactoryBuilder().build(reader);