依赖调整.

baomidou · Apr 29, 2024 · 169b708 · 169b708
1 parent 8c8f5de
commit 169b708
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 40 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ ext {
         mybatisVersion = '3.5.16',
         mybatisSpringVersion = '2.1.2',
         mybatisSpringBootStarterVersion = '2.3.1',
-        springVersion = '5.3.27',
+        springVersion = '5.3.34',
         springBootVersion = '2.7.18',
         springBoot3Version = '3.2.4',
         springCloudVersion = '3.1.8',
@@ -37,10 +37,9 @@ ext {
         "spring-web"                 : "org.springframework:spring-web:${springVersion}",
         "spring-aop"                 : "org.springframework:spring-aop:${springVersion}",
         "cglib"                      : "cglib:cglib:3.3.0",
-        "imadcn"                     : "com.imadcn.framework:idworker:1.5.0",
+        "imadcn"                     : "com.imadcn.framework:idworker:1.6.0",
         "spring-cloud-commons"       : "org.springframework.cloud:spring-cloud-commons:${springCloudVersion}",
 
-        "javax.servlet-api"          : "javax.servlet:javax.servlet-api:4.0.1",
         "aspectjweaver"              : "org.aspectj:aspectjweaver:1.9.22",
         "slf4j-api"                  : "org.slf4j:slf4j-api:1.7.36",
         //copy
@@ -50,8 +49,8 @@ ext {
         "assertj-core"               : "org.assertj:assertj-core:3.25.3",
         "junit-jupiter"              : "org.junit.jupiter:junit-jupiter:${junitVersion}",
         "fastjson"                   : "com.alibaba:fastjson:2.0.49",
-        "jackson"                    : "com.fasterxml.jackson.core:jackson-databind:2.16.1",
-        "gson"                       : "com.google.code.gson:gson:2.9.1",
+        "jackson"                    : "com.fasterxml.jackson.core:jackson-databind:2.17.0",
+        "gson"                       : "com.google.code.gson:gson:2.10.1",
         "lagarto"                    : "org.jodd:jodd-lagarto:6.0.6",
         //datasource
         "p6spy"                      : "p6spy:p6spy:3.9.1",
@@ -61,20 +60,18 @@ ext {
         "dm"                         : fileTree(dir: 'libs', includes: ["jdbcDriver-18.jar"]),
         "kingbase"                   : fileTree(dir: 'libs', includes: ["kingbase8-8.2.0.jar"]),
         "h2"                         : "com.h2database:h2:2.2.224",
-        "mysql"                      : "mysql:mysql-connector-java:8.0.30",
+        "mysql"                      : "com.mysql:mysql-connector-j:8.3.0",
         "sqlite"                     : "org.xerial:sqlite-jdbc:3.45.3.0",
-        "firebird"                   : "org.firebirdsql.jdbc:jaybird:4.0.6.java8",
+        "firebird"                   : "org.firebirdsql.jdbc:jaybird:5.0.4.java8",
         //cache
-        "mybatis-ehcache"            : "org.mybatis.caches:mybatis-ehcache:1.2.3",
-        "mybatis-redis"              : "org.mybatis.caches:mybatis-redis:1.0.0-SNAPSHOT",
         "mybatis-caffeine"           : "org.mybatis.caches:mybatis-caffeine:1.0.0",
         //code generator
         "velocity"            : "org.apache.velocity:velocity-engine-core:2.3",
         "freemarker"          : "org.freemarker:freemarker:2.3.32",
-        "beetl"               : "com.ibeetl:beetl:3.15.13.RELEASE",
-        "swagger-annotations" : "io.swagger:swagger-annotations:1.6.12",
+        "beetl"               : "com.ibeetl:beetl:3.16.1.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.5",
+        "logback-classic"     : "ch.qos.logback:logback-classic:1.5.6",
     ]
 }
 

diff --git a/mybatis-plus-core/build.gradle b/mybatis-plus-core/build.gradle
@@ -6,8 +6,6 @@ dependencies {
     implementation "${lib.cglib}"
     implementation "${lib.'spring-aop'}"
     implementation "${lib.'imadcn'}"
-    implementation "${lib.'mybatis-ehcache'}"
-    implementation "${lib.'mybatis-redis'}"
 
     testImplementation "${lib.'logback-classic'}"
 }
diff --git a/mybatis-plus-extension/build.gradle b/mybatis-plus-extension/build.gradle
@@ -23,7 +23,6 @@ dependencies {
     implementation "de.ruedigermoeller:fst:3.0.4-jdk17"
     implementation "com.alibaba.fastjson2:fastjson2:2.0.49"
     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"
     testImplementation "io.github.classgraph:classgraph:4.8.165"
     testImplementation "${lib.h2}"

diff --git a/mybatis-plus/build.gradle b/mybatis-plus/build.gradle
@@ -9,7 +9,6 @@ dependencies {
     implementation "${lib."mybatis-spring"}"
 
     testImplementation "${lib.'spring-web'}"
-    testImplementation "${lib.'javax.servlet-api'}"
 
     testImplementation "${lib.'spring-test'}"
     testImplementation "${lib.'spring-aop'}"
@@ -23,13 +22,10 @@ dependencies {
     testImplementation "${lib.postgresql}"
     testImplementation lib.oracle as ConfigurableFileTree
     testImplementation "${lib.mysql}"
-    testImplementation "${lib.'mybatis-ehcache'}"
-    testImplementation "${lib.'mybatis-redis'}"
     testImplementation "${lib.'spring-context-support'}"
     testImplementation "${lib.'spring-jdbc'}"
     testImplementation "${lib.'slf4j-api'}"
     testImplementation "${lib.'logback-classic'}"
-    testImplementation "javax.annotation:javax.annotation-api:1.3.2"
     testImplementation "${lib.cglib}"
     testImplementation "${lib.postgresql}"
 //    testCompile ('org.apache.phoenix:phoenix-core:5.0.0-HBase-2.0')

diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/BaseTest.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/BaseTest.java
@@ -17,16 +17,16 @@
 
 import com.baomidou.mybatisplus.test.h2.entity.H2User;
 import com.baomidou.mybatisplus.test.h2.enums.AgeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.DirtiesContext;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 @DirtiesContext
 public class BaseTest {
 
-    @Resource
+    @Autowired
     protected JdbcTemplate jdbcTemplate;
 
     protected static final String NQQ = "聂秋秋";

diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/CustomFillTest.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/CustomFillTest.java
@@ -11,17 +11,16 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import javax.annotation.Resource;
-
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-custom-fill-test-h2.xml"})
 public class CustomFillTest {
 
-    @Resource
+    @Autowired
     private TestModelMapper testModelMapper;
 
     @BeforeAll

diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2Delete1Eq1Test.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2Delete1Eq1Test.java
@@ -23,10 +23,10 @@
 import com.baomidou.mybatisplus.test.h2.mapper.H2UserMapper;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -40,9 +40,9 @@
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
 class H2Delete1Eq1Test extends BaseTest {
 
-    @Resource
+    @Autowired
     protected H2UserMapper logicDeleteMapper;
-    @Resource
+    @Autowired
     protected H2StudentMapper defaultMapper;
 
     @Test

diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2LogicDeleteTest.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2LogicDeleteTest.java
@@ -21,10 +21,10 @@
 import com.baomidou.mybatisplus.test.h2.mapper.H2UserLogicDeleteMapper;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -38,7 +38,7 @@
 @ContextConfiguration(locations = {"classpath:h2/spring-logic-delete-h2.xml"})
 class H2LogicDeleteTest extends BaseTest {
 
-    @Resource
+    @Autowired
     protected H2UserLogicDeleteMapper logicDeleteMapper;
 
     @Test

diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2StudentMapperTest.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2StudentMapperTest.java
@@ -27,10 +27,10 @@
 import com.baomidou.mybatisplus.test.h2.mapper.H2StudentMapper;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -46,7 +46,7 @@
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
 class H2StudentMapperTest extends BaseTest {
 
-    @Resource
+    @Autowired
     protected H2StudentMapper studentMapper;
 
     @Test

diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java
@@ -40,7 +40,6 @@
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -61,7 +60,7 @@
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
 class H2UserMapperTest extends BaseTest {
 
-    @Resource
+    @Autowired
     protected H2UserMapper userMapper;
 
     @Autowired

diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/LastSqlTest.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/LastSqlTest.java
@@ -10,10 +10,10 @@
 import com.baomidou.mybatisplus.test.h2.mapper.H2StudentMapper;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -27,7 +27,7 @@
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
 public class LastSqlTest {
 
-    @Resource
+    @Autowired
     private H2StudentMapper mapper;
 
     @Test

diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/phoenix/PhoenixTest.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/phoenix/PhoenixTest.java
@@ -11,11 +11,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import javax.annotation.Resource;
 
 import static com.baomidou.mybatisplus.core.enums.SqlMethod.UPSERT_ONE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -30,7 +30,7 @@
 @ContextConfiguration(locations = {"classpath:phoenix/spring-test-phoenix.xml"})
 public class PhoenixTest {
 
-    @Resource(name = "phoenixTestInfoMapper")
+    @Autowired
     PhoenixTestInfoMapper mapper;
 
     @Test

diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgresql/PostgresqlTest.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgresql/PostgresqlTest.java
@@ -6,18 +6,18 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:postgresql/spring-test-postgresql.xml"})
 public class PostgresqlTest {
-    @Resource
+    @Autowired
     private PgtableMappper mapper;
-    @Resource
+    @Autowired
     private IPgtableService pgtableService;
 
     @Test