Merge remote-tracking branch 'github/3.0' into github3.0

baomidou · Aug 12, 2024 · 08cc1f1 · 08cc1f1
2 parents e8b2efe + 33e471c
commit 08cc1f1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -67,7 +67,7 @@ ext {
         //code generator
         "velocity"            : "org.apache.velocity:velocity-engine-core:2.3",
         "freemarker"          : "org.freemarker:freemarker:2.3.33",
-        "beetl"               : "com.ibeetl:beetl:3.16.2.RELEASE",
+        "beetl"               : "com.ibeetl:beetl:3.17.0.RELEASE",
         "swagger-annotations" : "io.swagger:swagger-annotations:1.6.14",
         "enjoy"               : "com.jfinal:enjoy:5.1.3",
         "logback-classic"     : "ch.qos.logback:logback-classic:1.5.6",

diff --git a/changelog-temp.md b/changelog-temp.md
@@ -3,6 +3,7 @@
 - fix: 修复逻辑删除填充与乐观锁冲突
 - fix: 修复IllegalSQLInnerInterceptor分析嵌套count语句错误
 - fix: 升级jsqlParser5.0解决 for update 语句错误
+- fix: 修复处自增自减负数情况导致jsqlParser解析优化错误
 - opt: Page属性访问调整为private,重写toString方法
 - opt: 主键生成策略(uuid)不支持的类型打印警告日志
 - opt: MybatisPlusException转化为PersistenceException子类
@@ -14,6 +15,7 @@
 - feat: 升级kotlin2.0.0
 - feat: 升级SpringBoot3.3.2
 - feat: 升级fastjson2.0.52
+- feat: 升级mybatis-spring3.0.4
 - feat: 升级spring-cloud-commons4.1.4
 - feat: 部分支持依赖升级更新
 - feat: 支持GoldenDB数据库

diff --git a/settings.gradle b/settings.gradle
@@ -9,7 +9,7 @@ buildscript {
     dependencies {
         //noinspection DifferentKotlinGradleVersion
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.10"
-        classpath "io.freefair.gradle:lombok-plugin:8.6"
+        classpath "io.freefair.gradle:lombok-plugin:8.7.1"
         classpath "tech.yanand.maven-central-publish:tech.yanand.maven-central-publish.gradle.plugin:1.1.1"
     }
 }

diff --git a/spring-boot-starter/mybatis-plus-spring-boot3-starter/build.gradle b/spring-boot-starter/mybatis-plus-spring-boot3-starter/build.gradle
@@ -4,7 +4,7 @@ compileJava {
 
 dependencies {
     api project(":mybatis-plus")
-    api "org.mybatis:mybatis-spring:3.0.3"
+    api "org.mybatis:mybatis-spring:3.0.4"
     api project(":spring-boot-starter:mybatis-plus-spring-boot-autoconfigure")
     implementation platform("org.springframework.boot:spring-boot-dependencies:${springBoot3Version}")
     annotationProcessor "org.springframework.boot:spring-boot-autoconfigure-processor:${springBoot3Version}"

diff --git a/...spring-boot3-starter/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java b/...spring-boot3-starter/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java
@@ -61,7 +61,7 @@ void test() throws IOException {
             Assertions.assertEquals("import", bom.getScope());
             Assertions.assertFalse(bom.isOptional());
             Assertions.assertEquals(dependenciesMap.get("spring-cloud-commons").getVersion(), "4.1.4");
-            Assertions.assertEquals(dependenciesMap.get("mybatis-spring").getVersion(), "3.0.3");
+            Assertions.assertEquals(dependenciesMap.get("mybatis-spring").getVersion(), "3.0.4");
             Assertions.assertEquals(dependenciesMap.get("spring-boot-dependencies").getVersion(), "3.3.2");
         }
     }