3.4.1

usgate · Nov 10, 2020 · 98c1a45 · 98c1a45
1 parent e802a90
commit 98c1a45
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 60 deletions.
diff --git a/TEMP_CHANGELOG.md b/TEMP_CHANGELOG.md
@@ -3,3 +3,4 @@
 - feat: 新增 FakeTenantLineInnerInterceptor 对 TenantSqlParser 进行过度
 - feat: 分页count识别 `left join (subSelect)` 优化
 - feat: 所有 count 从 count(1) 变更为 count(*)
+- feat: mybatis up to 3.5.6
diff --git a/build.gradle b/build.gradle
@@ -1,19 +1,10 @@
 import java.text.SimpleDateFormat
 
-buildscript {
-    repositories {
-        maven { url "https://maven.aliyun.com/nexus/content/groups/public" }
-        maven { url "https://maven.aliyun.com/nexus/content/repositories/gradle-plugin" }
-        mavenCentral()
-        maven { url "https://plugins.gradle.org/m2/" }
-    }
-
-    dependencies {
-        //noinspection DifferentKotlinGradleVersion
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
-        classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0"
-    }
+allprojects {
+    group = 'com.baomidou'
+    version = "3.4.1"
 }
+
 ext {
     configuration = [
         javaVersion = JavaVersion.VERSION_1_8
@@ -26,7 +17,7 @@ ext {
         springVersion = '5.2.8.RELEASE',
         springBootVersion = '2.3.2.RELEASE',
         jsqlparserVersion = '3.2',
-        junitVersion = '5.6.2',
+        junitVersion = '5.7.0',
     ]
 
     lib = [
@@ -45,7 +36,6 @@ ext {
         "spring-aop"                 : "org.springframework:spring-aop:${springVersion}",
         "aspectjrt"                  : "org.aspectj:aspectjrt:1.9.6",
         "cglib"                      : "cglib:cglib:3.3.0",
-        "lombok"                     : "org.projectlombok:lombok:1.18.12",
         "imadcn"                     : "com.imadcn.framework:idworker:1.5.0",
 
         "javax.servlet-api"          : "javax.servlet:javax.servlet-api:4.0.1",
@@ -56,13 +46,12 @@ ext {
         "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.16.1",
-        "junit-jupiter-api"          : "org.junit.jupiter:junit-jupiter-api:${junitVersion}",
-        "junit-jupiter-engine"       : "org.junit.jupiter:junit-jupiter-engine:${junitVersion}",
-        "fastjson"                   : "com.alibaba:fastjson:1.2.73",
-        "jackson"                    : "com.fasterxml.jackson.core:jackson-databind:2.11.1",
+        "assertj-core"               : "org.assertj:assertj-core:3.18.0",
+        "junit-jupiter"              : "org.junit.jupiter:junit-jupiter:${junitVersion}",
+        "fastjson"                   : "com.alibaba:fastjson:1.2.75",
+        "jackson"                    : "com.fasterxml.jackson.core:jackson-databind:2.11.3",
         "gson"                       : "com.google.code.gson:gson:2.8.6",
-        "lagarto"                    : "org.jodd:jodd-lagarto:5.1.5",
+        "lagarto"                    : "org.jodd:jodd-lagarto:6.0.2",
         //datasource
         "p6spy"                      : "p6spy:p6spy:3.9.1",
         "sqlserver"                  : "com.microsoft.sqlserver:sqljdbc4:4.0",
@@ -86,23 +75,33 @@ ext {
     ]
 }
 
-allprojects {
-    group = 'com.baomidou'
-    version = "3.4.0.2-SNAPSHOT"
-}
-
 description = "Mybatis 增强工具包 - 只做增强不做改变，简化CRUD操作"
 
 subprojects {
-
     apply plugin: 'java-library'
     apply plugin: 'signing'
     apply plugin: 'maven-publish'
+    apply plugin: "io.freefair.lombok"
     apply plugin: 'com.github.hierynomus.license'
 
     sourceCompatibility = "${javaVersion}"
     targetCompatibility = "${javaVersion}"
 
+    repositories {
+        mavenLocal()
+        maven { url "https://maven.aliyun.com/repository/public" }
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        jcenter()
+    }
+
+    dependencies {
+        testImplementation "${lib["assertj-core"]}"
+        testImplementation "${lib["junit-jupiter"]}"
+        testImplementation "org.mockito:mockito-junit-jupiter:3.6.0"
+        testImplementation "${lib["lagarto"]}"
+        testImplementation "${lib["logback-classic"]}"
+    }
+
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
         options.warnings = false
@@ -142,27 +141,6 @@ subprojects {
         ignoreFailures = true
     }
 
-    repositories {
-        mavenLocal()
-        maven { url "https://maven.aliyun.com/repository/public" }
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        jcenter()
-    }
-
-    dependencies {
-        annotationProcessor "${lib.lombok}"
-        compileOnly "${lib.lombok}"
-        testAnnotationProcessor "${lib.lombok}"
-        testCompileOnly "${lib.lombok}"
-
-        testImplementation "${lib["assertj-core"]}"
-        testImplementation "${lib["junit-jupiter-api"]}"
-        testRuntimeOnly "${lib["junit-jupiter-engine"]}"
-        testImplementation "org.mockito:mockito-junit-jupiter:3.4.4"
-        testImplementation "${lib["lagarto"]}"
-        testImplementation "${lib["logback-classic"]}"
-    }
-
     //noinspection GroovyAssignabilityCheck
     task sourcesJar(type: Jar) {
         archiveClassifier = 'sources'

diff --git a/mybatis-plus-boot-starter-test/build.gradle b/mybatis-plus-boot-starter-test/build.gradle
@@ -6,6 +6,5 @@ dependencies {
     api "org.springframework.boot:spring-boot-autoconfigure"
     api "org.springframework.boot:spring-boot-starter-test"
     api "org.springframework:spring-tx"
-    implementation "${lib.'junit-jupiter-api'}"
     testImplementation "${lib.h2}"
 }
diff --git a/...is-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java b/...is-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java
@@ -17,6 +17,7 @@
 
 import jodd.io.FileUtil;
 import jodd.jerry.Jerry;
+import jodd.jerry.JerryParser;
 import jodd.lagarto.dom.LagartoDOMBuilder;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -47,7 +48,7 @@ private static class Dependency {
     @Test
     void test() throws IOException {
         try (InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml")) {
-            Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
+            JerryParser jerryParser = Jerry.create(new LagartoDOMBuilder().enableXmlMode());
             Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
             Jerry dependencies = doc.s("dependencies dependency");
             Map<String, Dependency> dependenciesMap = new HashMap<>();

diff --git a/...rc/test/java/com/baomidou/mybatisplus/core/incrementer/ImadcnIdentifierGeneratorTest.java b/...rc/test/java/com/baomidou/mybatisplus/core/incrementer/ImadcnIdentifierGeneratorTest.java
@@ -9,8 +9,8 @@
  * @author miemie
  * @since 2020-08-11
  */
-@Disabled
-public class ImadcnIdentifierGeneratorTest {
+@Disabled("不需要参与全局test")
+class ImadcnIdentifierGeneratorTest {
 
     private static ImadcnIdentifierGenerator generator;
 

diff --git a/mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java b/mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java
@@ -17,6 +17,7 @@
 
 import jodd.io.FileUtil;
 import jodd.jerry.Jerry;
+import jodd.jerry.JerryParser;
 import jodd.lagarto.dom.LagartoDOMBuilder;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -47,7 +48,7 @@ private static class Dependency {
     @Test
     void test() throws IOException {
         try (InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml");) {
-            Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
+            JerryParser jerryParser = Jerry.create(new LagartoDOMBuilder().enableXmlMode());
             Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
             Jerry dependencies = doc.s("dependencies dependency");
             Map<String, Dependency> dependenciesMap = new HashMap<>();

diff --git a/...sion/src/test/java/com/baomidou/mybatisplus/test/handlers/MybatisEnumTypeHandlerTest.java b/...sion/src/test/java/com/baomidou/mybatisplus/test/handlers/MybatisEnumTypeHandlerTest.java
@@ -17,7 +17,7 @@
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.baomidou.mybatisplus.annotation.IEnum;
-import com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler;
+import com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.apache.ibatis.type.JdbcType;
@@ -168,5 +168,4 @@ public void getResultFromCallableStatement() throws Exception {
         when(callableStatement.getObject(6)).thenReturn(null);
         assertNull(GRADE_ENUM_ENUM_TYPE_HANDLER.getResult(callableStatement, 6));
     }
-
 }
diff --git a/mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java b/mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java
@@ -17,6 +17,7 @@
 
 import jodd.io.FileUtil;
 import jodd.jerry.Jerry;
+import jodd.jerry.JerryParser;
 import jodd.lagarto.dom.LagartoDOMBuilder;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -47,7 +48,7 @@ private static class Dependency {
     @Test
     void test() throws IOException {
         try (InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml");) {
-            Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
+            JerryParser jerryParser = Jerry.create(new LagartoDOMBuilder().enableXmlMode());
             Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
             Jerry dependencies = doc.s("dependencies dependency");
             Map<String, Dependency> dependenciesMap = new HashMap<>();

diff --git a/...-generator/src/test/java/com/baomidou/mybatisplus/test/generator/pom/GeneratePomTest.java b/...-generator/src/test/java/com/baomidou/mybatisplus/test/generator/pom/GeneratePomTest.java
@@ -17,6 +17,7 @@
 
 import jodd.io.FileUtil;
 import jodd.jerry.Jerry;
+import jodd.jerry.JerryParser;
 import jodd.lagarto.dom.LagartoDOMBuilder;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -47,7 +48,7 @@ private static class Dependency {
     @Test
     void test() throws IOException {
         try (InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml")) {
-            Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
+            JerryParser jerryParser = Jerry.create(new LagartoDOMBuilder().enableXmlMode());
             Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
             Jerry dependencies = doc.s("dependencies dependency");
             Map<String, Dependency> dependenciesMap = new HashMap<>();

diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java
@@ -17,6 +17,7 @@
 
 import jodd.io.FileUtil;
 import jodd.jerry.Jerry;
+import jodd.jerry.JerryParser;
 import jodd.lagarto.dom.LagartoDOMBuilder;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -46,8 +47,8 @@ private static class Dependency {
 
     @Test
     void test() throws IOException {
-        try (InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml");) {
-            Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
+        try (InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml")) {
+            JerryParser jerryParser = Jerry.create((new LagartoDOMBuilder().enableXmlMode()));
             Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
             Jerry dependencies = doc.s("dependencies dependency");
             Map<String, Dependency> dependenciesMap = new HashMap<>();

diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,19 @@
+buildscript {
+    repositories {
+        maven { url "https://maven.aliyun.com/nexus/content/groups/public" }
+        maven { url "https://maven.aliyun.com/nexus/content/repositories/gradle-plugin" }
+        mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+
+    dependencies {
+        //noinspection DifferentKotlinGradleVersion
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
+        classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0"
+        classpath "io.freefair.gradle:lombok-plugin:5.3.0"
+    }
+}
+
 rootProject.name = 'mybatis-plus-root'
 include 'mybatis-plus'
 include 'mybatis-plus-core'
@@ -6,4 +22,3 @@ include 'mybatis-plus-extension'
 include 'mybatis-plus-generator'
 include 'mybatis-plus-boot-starter'
 include 'mybatis-plus-boot-starter-test'
-