From e1b68f53cb367ce7efb4a0c18e100fd6e2685469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=81=82=E7=A7=8B=E8=8D=A3?= Date: Mon, 21 Oct 2024 14:45:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .kotlin/errors/errors-1726886507129.log | 4 ---- build.gradle | 4 ++-- changelog-temp.md | 4 +++- .../com/baomidou/mybatisplus/test/pom/GeneratePomTest.java | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 .kotlin/errors/errors-1726886507129.log diff --git a/.kotlin/errors/errors-1726886507129.log b/.kotlin/errors/errors-1726886507129.log deleted file mode 100644 index 7cd151b6c..000000000 --- a/.kotlin/errors/errors-1726886507129.log +++ /dev/null @@ -1,4 +0,0 @@ -kotlin version: 2.0.20 -error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output: - 1. Kotlin compile daemon is ready - diff --git a/build.gradle b/build.gradle index 6e5c2081f..4e3a6bcdb 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ ext { mybatisSpringBootStarterVersion = '2.3.2', springVersion = '5.3.39', springBootVersion = '2.7.18', - springBoot3Version = '3.3.3', + springBoot3Version = '3.3.4', springCloudVersion = '3.1.8', junitVersion = '5.11.0', ] @@ -63,7 +63,7 @@ ext { //cache "mybatis-caffeine" : "org.mybatis.caches:mybatis-caffeine:1.2.0", //code generator - "velocity" : "org.apache.velocity:velocity-engine-core:2.3", + "velocity" : "org.apache.velocity:velocity-engine-core:2.4", "freemarker" : "org.freemarker:freemarker:2.3.33", "beetl" : "com.ibeetl:beetl:3.17.0.RELEASE", "swagger-annotations" : "io.swagger:swagger-annotations:1.6.14", diff --git a/changelog-temp.md b/changelog-temp.md index 8f3113f71..9bc367c61 100644 --- a/changelog-temp.md +++ b/changelog-temp.md @@ -1,5 +1,7 @@ - - opt: 优化代码生成器支持可视化配置生成能力 - opt: 解耦扩展包不再强制依赖 spring 开发框架 +- opt: 拆分jsqlparser支持模块,提供mybatis-plus-jsqlparser(支持最新jsqlparser)与mybatis-plus-jsqlparser-4.9模块, 默认不携带,升级后需要自行引入. - feat: 重构 service 模块抽象为 CrudRepository 不再建议使用 IService 避免业务层数据混乱 - feat: 新增 solon 启动插件支持 +- feat: 升级SpringBoot3.3.4 +- feat: 升级velocity2.4 diff --git a/spring-boot-starter/mybatis-plus-spring-boot3-starter/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java b/spring-boot-starter/mybatis-plus-spring-boot3-starter/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java index a0b189f52..6a3f02e64 100644 --- a/spring-boot-starter/mybatis-plus-spring-boot3-starter/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java +++ b/spring-boot-starter/mybatis-plus-spring-boot3-starter/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java @@ -62,7 +62,7 @@ void test() throws IOException { Assertions.assertFalse(bom.isOptional()); Assertions.assertEquals(dependenciesMap.get("spring-cloud-commons").getVersion(), "4.1.4"); Assertions.assertEquals(dependenciesMap.get("mybatis-spring").getVersion(), "3.0.4"); - Assertions.assertEquals(dependenciesMap.get("spring-boot-dependencies").getVersion(), "3.3.3"); + Assertions.assertEquals(dependenciesMap.get("spring-boot-dependencies").getVersion(), "3.3.4"); } }