소스 검색

依赖调整.

nieqiuqiu 5 년 전
부모
커밋
69f9b03184

+ 7 - 11
build.gradle

@@ -26,7 +26,7 @@ ext {
         springVersion = '5.2.0.RELEASE',
         springBootVersion = '2.2.0.RELEASE',
         jsqlparserVersion = '3.0',
-        junitVersion = '5.4.0',
+        junitVersion = '5.5.2',
     ]
 
     lib = [
@@ -49,18 +49,15 @@ ext {
 
         "javax.servlet-api"          : "javax.servlet:javax.servlet-api:4.0.1",
         "aspectjweaver"              : "org.aspectj:aspectjweaver:1.9.4",
-        "mockito"                    : "org.mockito:mockito-core:2.24.0",
-        "mybatis-ehcache"            : "org.mybatis.caches:mybatis-ehcache:1.1.0",
-        "slf4j-api"                  : "org.slf4j:slf4j-api:1.7.25",
+        "slf4j-api"                  : "org.slf4j:slf4j-api:1.7.28",
         "logback-classic"            : "ch.qos.logback:logback-classic:1.2.3",
         //copy
         "mybatis-spring-boot-starter": "org.mybatis.spring.boot:mybatis-spring-boot-starter:${mybatisSpringBootStarterVersion}",
         //test
         "spring-test"                : "org.springframework:spring-test:${springVersion}",
-        "assertj-core"               : "org.assertj:assertj-core:3.12.2",
+        "assertj-core"               : "org.assertj:assertj-core:3.13.2",
         "junit-jupiter-api"          : "org.junit.jupiter:junit-jupiter-api:${junitVersion}",
         "junit-jupiter-engine"       : "org.junit.jupiter:junit-jupiter-engine:${junitVersion}",
-        "mockito-all"                : "org.mockito:mockito-all:1.10.19",
         "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",
@@ -69,7 +66,6 @@ ext {
         "hikaricp"                   : "com.zaxxer:HikariCP:3.4.1",
         "druid"                      : "com.alibaba:druid:1.1.20",
         "p6spy"                      : "p6spy:p6spy:3.8.6",
-        "commons-dbcp2"              : "org.apache.commons:commons-dbcp2:2.5.0",
         "sqlserver"                  : "com.microsoft.sqlserver:sqljdbc4:4.0",
         "postgresql"                 : "org.postgresql:postgresql:9.4.1212",
         "oracle"                     : fileTree(dir: 'libs', includes: ['ojdbc-11.2.0.3-jdk16.jar']),
@@ -79,8 +75,8 @@ ext {
         "mysql"                      : "mysql:mysql-connector-java:8.0.15",
         "sqlite"                     : "org.xerial:sqlite-jdbc:3.27.2.1",
         //code generator
-        "velocity"                   : "org.apache.velocity:velocity-engine-core:2.0",
-        "freemarker"                 : "org.freemarker:freemarker:2.3.28",
+        "velocity"                   : "org.apache.velocity:velocity-engine-core:2.1",
+        "freemarker"                 : "org.freemarker:freemarker:2.3.29",
         "beetl"                      : "com.ibeetl:beetl:2.9.8",
         "swagger-annotations"        : "io.swagger:swagger-annotations:1.5.21"
     ]
@@ -149,9 +145,9 @@ subprojects {
         testImplementation("${lib["assertj-core"]}")
         testImplementation("${lib["junit-jupiter-api"]}")
         testRuntimeOnly("${lib["junit-jupiter-engine"]}")
-        testCompileOnly("${lib["mockito-all"]}")
-        testImplementation("org.mockito:mockito-junit-jupiter:2.24.0")
+        testImplementation("org.mockito:mockito-junit-jupiter:3.1.0")
         testImplementation("${lib["lagarto"]}")
+        testImplementation("${lib["logback-classic"]}")
     }
 
     //noinspection GroovyAssignabilityCheck

+ 15 - 0
mybatis-plus-boot-starter/src/main/java/com/baomidou/mybatisplus/autoconfigure/MybatisPlusLanguageDriverAutoConfiguration.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2011-2020, baomidou (jobob@qq.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.baomidou.mybatisplus.autoconfigure;
 
 import com.baomidou.mybatisplus.core.toolkit.Constants;

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

@@ -6,11 +6,6 @@ dependencies {
 
     implementation "${lib.cglib}"
     implementation "${lib.'spring-aop'}"
-    
-
-    testCompile "${lib.'mybatis-ehcache'}"
-    testCompile "${lib.'logback-classic'}"
-    testCompile "${lib.'commons-dbcp2'}"
 
     testCompile "${lib.aspectjweaver}"
     testCompile "${lib.hikaricp}"

+ 0 - 3
mybatis-plus-dts/build.gradle

@@ -1,6 +1,3 @@
-ext{
-    springBootVersion = "2.1.2.RELEASE"
-}
 dependencies {
     api project(":mybatis-plus-core")
     implementation(enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}" as String))

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

@@ -19,7 +19,6 @@ dependencies {
     testImplementation("${lib["fastjson"]}")
 
     testImplementation("${lib["hikaricp"]}")
-    testImplementation("${lib["commons-dbcp2"]}")
     testImplementation("${lib["druid"]}")
     testImplementation("${lib["tomcatjdbc"]}")
 
@@ -28,5 +27,4 @@ dependencies {
     testImplementation("${lib["postgresql"]}")
     testImplementation(lib["oracle"] as ConfigurableFileTree)
     testImplementation("${lib["mysql"]}")
-    testImplementation("${lib["logback-classic"]}")
 }

+ 0 - 1
mybatis-plus-generator/build.gradle

@@ -13,6 +13,5 @@ dependencies {
     testCompile "${lib.h2}"
     testCompile "${lib.mysql}"
     testCompile "${lib.sqlite}"
-    testCompile "${lib.'logback-classic'}"
     testCompile "${lib.'swagger-annotations'}"
 }

+ 0 - 2
mybatis-plus/build.gradle

@@ -9,7 +9,6 @@ dependencies {
     testCompile "${lib.fastjson}"
 
     testCompile "${lib.hikaricp}"
-    testCompile "${lib.'commons-dbcp2'}"
     testCompile "${lib.druid}"
     testCompile "${lib.tomcatjdbc}"
 
@@ -19,7 +18,6 @@ dependencies {
     testCompile lib.oracle as ConfigurableFileTree
     testCompile "${lib.mysql}"
     testCompile "${lib.jackson}"
-    testCompile "${lib.'logback-classic'}"
 
     testCompile "${lib.'spring-context-support'}"
     testCompile "${lib.'spring-jdbc'}"