Skip to content

Commit adb5615

Browse files
committed
升级依赖
1 parent 1287959 commit adb5615

7 files changed

Lines changed: 33 additions & 25 deletions

File tree

build.gradle

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ ext {
1616
mybatisSpringBootStarterVersion = '2.3.2',
1717
springVersion = '5.3.39',
1818
springBootVersion = '2.7.18',
19-
springBoot3Version = '3.4.1',
20-
springBoot4Version = '4.0.0',
19+
springBoot3Version = '3.5.9',
20+
springBoot4Version = '4.0.1',
2121
springCloudVersion = '3.1.8',
22-
junitVersion = '5.11.0',
22+
junitVersion = '5.14.1',
2323
]
2424

2525
lib = [
@@ -45,23 +45,23 @@ ext {
4545
"mybatis-spring-boot-starter": "org.mybatis.spring.boot:mybatis-spring-boot-starter:${mybatisSpringBootStarterVersion}",
4646
//test
4747
"spring-test" : "org.springframework:spring-test:${springVersion}",
48-
"assertj-core" : "org.assertj:assertj-core:3.26.3",
48+
"assertj-core" : "org.assertj:assertj-core:3.27.6",
4949
"junit-jupiter" : "org.junit.jupiter:junit-jupiter:${junitVersion}",
50-
"fastjson" : "com.alibaba:fastjson:2.0.53",
51-
"jackson" : "com.fasterxml.jackson.core:jackson-databind:2.17.3",
50+
"fastjson" : "com.alibaba:fastjson:2.0.60",
51+
"jackson" : "com.fasterxml.jackson.core:jackson-databind:2.20.1",
5252
"jackson3" : "tools.jackson.core:jackson-databind:3.0.3",
53-
"gson" : "com.google.code.gson:gson:2.11.0",
53+
"gson" : "com.google.code.gson:gson:2.13.2",
5454
"lagarto" : "org.jodd:jodd-lagarto:6.0.6",
5555
//datasource
5656
"p6spy" : "p6spy:p6spy:3.9.1",
5757
"sqlserver" : "com.microsoft.sqlserver:sqljdbc4:4.0",
58-
"postgresql" : "org.postgresql:postgresql:42.7.4",
58+
"postgresql" : "org.postgresql:postgresql:42.7.8",
5959
"oracle" : "com.oracle.database.jdbc:ojdbc8:23.7.0.25.01",
6060
"dm" : fileTree(dir: 'libs', includes: ["jdbcDriver-18.jar"]),
61-
"h2" : "com.h2database:h2:2.3.232",
62-
"mysql" : "com.mysql:mysql-connector-j:9.0.0",
63-
"sqlite" : "org.xerial:sqlite-jdbc:3.46.1.0",
64-
"firebird" : "org.firebirdsql.jdbc:jaybird:5.0.5.java8",
61+
"h2" : "com.h2database:h2:2.4.240",
62+
"mysql" : "com.mysql:mysql-connector-j:9.5.0",
63+
"sqlite" : "org.xerial:sqlite-jdbc:3.51.1.0",
64+
"firebird" : "org.firebirdsql.jdbc:jaybird:5.0.10.java8",
6565
"gaussdb" : "com.huaweicloud.gaussdb:gaussdbjdbc:506.0.0.b058",
6666
//cache
6767
"mybatis-caffeine" : "org.mybatis.caches:mybatis-caffeine:1.2.0",
@@ -105,8 +105,11 @@ subprojects {
105105
dependencies {
106106
testImplementation "${lib["assertj-core"]}"
107107
testImplementation "${lib["junit-jupiter"]}"
108-
testImplementation "org.mockito:mockito-junit-jupiter:5.13.0"
108+
testImplementation "org.mockito:mockito-junit-jupiter:5.21.0"
109109
testImplementation "${lib["lagarto"]}"
110+
testImplementation("org.junit.platform:junit-platform-engine:6.0.1")
111+
testImplementation("org.junit.jupiter:junit-jupiter-engine:6.0.1")
112+
testImplementation("org.junit.platform:junit-platform-launcher:6.0.1")
110113
}
111114

112115
tasks.withType(JavaCompile) {

changelog-temp.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,13 @@
1+
- fix: 修复`Jackson3TypeHandler`自定义`ObjectMapper`无效
2+
- fix: 处理`PackageConfig`指定模块为空时拼接错误
3+
- feat: 升级`SpringBoot3`至3.5.9
4+
- feat: 升级`JUnit`单元测试
5+
- feat: 升级`fastjson`至2.0.60
6+
- feat: 升级`jackson`至2.20.1
7+
- feat: 升级`gson`至2.13.2
8+
- feat: 升级`postgresql`至42.7.8
9+
- feat: 升级`h2database`至2.4.240
10+
- feat: 升级`mysql-connector-j`至9.5.0
11+
- feat: 升级`sqlite-jdbc`至3.51.1.0
12+
- feat: 升级`jaybird`至5.0.10.java8
113
- feat: `mybatis-plus-spring-boot4-starter`依赖升级`mybatis-spring`4.0.0
2-
- feat: `mybatis-plus-spring-boot3-starter`测试依赖升级`mybatis-spring-boot-starter`至3.0.5

spring-boot-starter/mybatis-plus-spring-boot3-starter/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
implementation "${lib['mybatis-thymeleaf']}"
1717
implementation "org.mybatis.scripting:mybatis-velocity:2.3.0"
1818
implementation "${lib.'mybatis-freemarker'}"
19-
implementation "org.springframework.cloud:spring-cloud-commons:4.1.4"
19+
implementation "org.springframework.cloud:spring-cloud-commons:4.1.6"
2020
testImplementation "org.springframework.boot:spring-boot-starter-test"
2121
testImplementation "org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.5"
2222
testImplementation "${lib.h2}"

spring-boot-starter/mybatis-plus-spring-boot3-starter/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ void test() throws IOException {
6060
Dependency bom = dependenciesMap.get("spring-boot-dependencies");
6161
Assertions.assertEquals("import", bom.getScope());
6262
Assertions.assertFalse(bom.isOptional());
63-
Assertions.assertEquals("4.1.4", dependenciesMap.get("spring-cloud-commons").getVersion());
63+
Assertions.assertEquals("4.1.6", dependenciesMap.get("spring-cloud-commons").getVersion());
6464
Assertions.assertEquals("3.0.5", dependenciesMap.get("mybatis-spring").getVersion());
65-
Assertions.assertEquals("3.4.1", dependenciesMap.get("spring-boot-dependencies").getVersion());
65+
Assertions.assertEquals("3.5.9", dependenciesMap.get("spring-boot-dependencies").getVersion());
6666
}
6767
}
6868

spring-boot-starter/mybatis-plus-spring-boot4-starter-test/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ dependencies {
99
api "org.springframework.boot:spring-boot-autoconfigure"
1010
api "org.springframework.boot:spring-boot-starter-test"
1111
api "org.springframework:spring-tx"
12-
testImplementation("org.junit.platform:junit-platform-engine:6.0.0-M2")
13-
testImplementation("org.junit.jupiter:junit-jupiter-engine:6.0.0-M2")
14-
testImplementation("org.junit.platform:junit-platform-launcher:6.0.0-M2")
1512
testImplementation "org.springframework.boot:spring-boot-starter-jdbc"
1613
testImplementation "org.springframework.boot:spring-boot-starter-cache"
1714
testImplementation "${lib.h2}"

spring-boot-starter/mybatis-plus-spring-boot4-starter/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ dependencies {
1818
implementation "${lib.'mybatis-freemarker'}"
1919
implementation "org.springframework.cloud:spring-cloud-commons:5.0.0"
2020
testImplementation "org.springframework.boot:spring-boot-starter-test"
21-
testImplementation("org.junit.platform:junit-platform-engine:6.0.0-M2")
22-
testImplementation("org.junit.jupiter:junit-jupiter-engine:6.0.0-M2")
23-
testImplementation("org.junit.platform:junit-platform-launcher:6.0.0-M2")
24-
// testImplementation "org.mybatis.spring.boot:mybatis-spring-boot-starter:4.0.0-SNAPSHOT"
21+
testImplementation "org.mybatis.spring.boot:mybatis-spring-boot-starter:4.0.1"
2522
testImplementation "${lib.h2}"
2623
}
2724

spring-boot-starter/mybatis-plus-spring-boot4-starter/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void test() throws IOException {
6262
Assertions.assertFalse(bom.isOptional());
6363
Assertions.assertEquals("5.0.0", dependenciesMap.get("spring-cloud-commons").getVersion());
6464
Assertions.assertEquals("4.0.0", dependenciesMap.get("mybatis-spring").getVersion());
65-
Assertions.assertEquals("4.0.0", dependenciesMap.get("spring-boot-dependencies").getVersion());
65+
Assertions.assertEquals("4.0.1", dependenciesMap.get("spring-boot-dependencies").getVersion());
6666
}
6767
}
6868

0 commit comments

Comments
 (0)