Sfoglia il codice sorgente

预升级mybatis版本

miemie 5 anni fa
parent
commit
c3436723a3
2 ha cambiato i file con 49 aggiunte e 45 eliminazioni
  1. 48 45
      build.gradle
  2. 1 0
      mybatis-plus-boot-starter/build.gradle

+ 48 - 45
build.gradle

@@ -19,8 +19,9 @@ ext {
     ]
 
     libraries = [
-        mybatisSpringVersion = '2.0.1',
-        mybatisVersion = '3.5.1',
+        mybatisVersion = '3.5.2',
+        mybatisSpringVersion = '2.0.2',
+        mybatisSpringBootStarterVersion = '2.1.0',
         springVersion = '5.1.6.RELEASE',
         springBootVersion = '2.1.6.RELEASE',
         jsqlparserVersion = '1.2',
@@ -28,53 +29,55 @@ ext {
     ]
 
     lib = [
-        "kotlin-reflect"        : "org.jetbrains.kotlin:kotlin-reflect:1.3.10",
-        "kotlin-stdlib-jdk8"    : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.10",
-        "jsqlparser"            : "com.github.jsqlparser:jsqlparser:${jsqlparserVersion}",
-        "mybatis-spring"        : "org.mybatis:mybatis-spring:${mybatisSpringVersion}",
-        "mybatis"               : "org.mybatis:mybatis:${mybatisVersion}",
-        "spring-context-support": "org.springframework:spring-context-support:${springVersion}",
-        "spring-jdbc"           : "org.springframework:spring-jdbc:${springVersion}",
-        "spring-tx"             : "org.springframework:spring-tx:${springVersion}",
-        "spring-web"            : "org.springframework:spring-web:${springVersion}",
-        "spring-aop"            : "org.springframework:spring-aop:${springVersion}",
-        "aspectjrt"             : "org.aspectj:aspectjrt:1.8.13",
-        "cglib"                 : "cglib:cglib:3.2.6",
-        "lombok"                : "org.projectlombok:lombok:1.18.4",
+        "kotlin-reflect"             : "org.jetbrains.kotlin:kotlin-reflect:1.3.10",
+        "kotlin-stdlib-jdk8"         : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.10",
+        "jsqlparser"                 : "com.github.jsqlparser:jsqlparser:${jsqlparserVersion}",
+        "mybatis-spring"             : "org.mybatis:mybatis-spring:${mybatisSpringVersion}",
+        "mybatis"                    : "org.mybatis:mybatis:${mybatisVersion}",
+        "spring-context-support"     : "org.springframework:spring-context-support:${springVersion}",
+        "spring-jdbc"                : "org.springframework:spring-jdbc:${springVersion}",
+        "spring-tx"                  : "org.springframework:spring-tx:${springVersion}",
+        "spring-web"                 : "org.springframework:spring-web:${springVersion}",
+        "spring-aop"                 : "org.springframework:spring-aop:${springVersion}",
+        "aspectjrt"                  : "org.aspectj:aspectjrt:1.8.13",
+        "cglib"                      : "cglib:cglib:3.2.6",
+        "lombok"                     : "org.projectlombok:lombok:1.18.4",
 
-        "javax.servlet-api"     : "javax.servlet:javax.servlet-api:4.0.1",
-        "aspectjweaver"         : "org.aspectj:aspectjweaver:1.9.2",
-        "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",
-        "logback-classic"       : "ch.qos.logback:logback-classic:1.2.3",
+        "javax.servlet-api"          : "javax.servlet:javax.servlet-api:4.0.1",
+        "aspectjweaver"              : "org.aspectj:aspectjweaver:1.9.2",
+        "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",
+        "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",
-        "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.56",
-        "jackson"               : "com.fasterxml.jackson.core:jackson-databind:2.9.6",
-        "tomcatjdbc"            : "org.apache.tomcat:tomcat-jdbc:9.0.16",
-        "lagarto"               : "org.jodd:jodd-lagarto:5.0.7",
+        "spring-test"                : "org.springframework:spring-test:${springVersion}",
+        "assertj-core"               : "org.assertj:assertj-core:3.12.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.56",
+        "jackson"                    : "com.fasterxml.jackson.core:jackson-databind:2.9.6",
+        "tomcatjdbc"                 : "org.apache.tomcat:tomcat-jdbc:9.0.16",
+        "lagarto"                    : "org.jodd:jodd-lagarto:5.0.7",
         //datasource
-        "hikaricp"              : "com.zaxxer:HikariCP:3.3.0",
-        "druid"                 : "com.alibaba:druid:1.0.29",
-        "p6spy"                 : "p6spy:p6spy:3.8.1",
-        "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']),
-        "dm"                    : fileTree(dir: 'libs', includes: ["jdbcDriver-18.jar"]),
-        "h2"                    : "com.h2database:h2:1.4.197",
-        "mysql"                 : "mysql:mysql-connector-java:8.0.15",
-        "sqlite"                : "org.xerial:sqlite-jdbc:3.27.2.1",
+        "hikaricp"                   : "com.zaxxer:HikariCP:3.3.0",
+        "druid"                      : "com.alibaba:druid:1.0.29",
+        "p6spy"                      : "p6spy:p6spy:3.8.1",
+        "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']),
+        "dm"                         : fileTree(dir: 'libs', includes: ["jdbcDriver-18.jar"]),
+        "h2"                         : "com.h2database:h2:1.4.197",
+        "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",
-        "beetl"                 : "com.ibeetl:beetl:2.9.8",
-        "swagger-annotations"   : "io.swagger:swagger-annotations:1.5.21"
+        "velocity"                   : "org.apache.velocity:velocity-engine-core:2.0",
+        "freemarker"                 : "org.freemarker:freemarker:2.3.28",
+        "beetl"                      : "com.ibeetl:beetl:2.9.8",
+        "swagger-annotations"        : "io.swagger:swagger-annotations:1.5.21"
     ]
 }
 

+ 1 - 0
mybatis-plus-boot-starter/build.gradle

@@ -8,6 +8,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-configuration-processor'
     implementation 'org.springframework.boot:spring-boot-autoconfigure-processor'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation "${lib.'mybatis-spring-boot-starter'}"
 }
 
 compileJava.dependsOn(processResources)