Merge branch 'github3.0' into 3.0

build.gradle

@@ -23,8 +23,8 @@ ext {
     ]
 
     lib = [
-        "kotlin-reflect"             : "org.jetbrains.kotlin:kotlin-reflect:1.9.0",
-        "kotlin-stdlib-jdk8"         : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0",
+        "kotlin-reflect"             : "org.jetbrains.kotlin:kotlin-reflect:1.9.22",
+        "kotlin-stdlib-jdk8"         : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22",
         "jsqlparser"                 : "com.github.jsqlparser:jsqlparser:${jsqlparserVersion}",
         "mybatis"                    : "org.mybatis:mybatis:${mybatisVersion}",
         "mybatis-spring"             : "org.mybatis:mybatis-spring:${mybatisSpringVersion}",
@@ -47,7 +47,7 @@ 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.23.1",
+        "assertj-core"               : "org.assertj:assertj-core:3.25.3",
         "junit-jupiter"              : "org.junit.jupiter:junit-jupiter:${junitVersion}",
         "fastjson"                   : "com.alibaba:fastjson:2.0.44",
         "jackson"                    : "com.fasterxml.jackson.core:jackson-databind:2.16.1",

mybatis-plus-extension/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     implementation "${lib.'mybatis-velocity'}"
     implementation "${lib.'mybatis-freemarker'}"
     implementation "de.ruedigermoeller:fst:3.0.4-jdk17"
-    implementation "com.alibaba.fastjson2:fastjson2:2.0.44"
+    implementation "com.alibaba.fastjson2:fastjson2:2.0.47"
     implementation "com.github.ben-manes.caffeine:caffeine:2.9.3"
     testImplementation "com.github.pagehelper:pagehelper:5.3.1"
     testImplementation "com.google.guava:guava:33.0.0-jre"

mybatis-plus-generator/build.gradle

@@ -5,7 +5,7 @@ dependencies {
     implementation "${lib.beetl}"
     implementation "${lib.enjoy}"
 
-    compileOnly "org.jetbrains:annotations:22.0.0"
+    compileOnly "org.jetbrains:annotations:24.1.0"
     testImplementation "${lib.sqlserver}"
     testImplementation "${lib.postgresql}"
     testImplementation lib.oracle as ConfigurableFileTree
@@ -16,5 +16,5 @@ dependencies {
     testImplementation "${lib.firebird}"
     testImplementation "${lib.'swagger-annotations'}"
     testImplementation "${lib.'logback-classic'}"
-    testCompileOnly "org.jetbrains:annotations:22.0.0"
+    testCompileOnly "org.jetbrains:annotations:24.1.0"
 }