From c499edf060812340ef2050ab820f3083348e1041 Mon Sep 17 00:00:00 2001 From: mingri31164 <3116430062@qq.com> Date: Wed, 29 Oct 2025 14:38:10 +0800 Subject: [PATCH] rollback mockito version to 3.12.4 --- dependencies/pom.xml | 13 +------------ infra/common/pom.xml | 5 +++++ .../org.mockito.plugins.MockMaker | 1 - pom.xml | 7 ++++++- threadpool/core/pom.xml | 2 +- .../org.mockito.plugins.MockMaker | 2 -- 6 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 infra/common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker delete mode 100644 threadpool/core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 342a8849..af91cef3 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -17,8 +17,7 @@ 0.9.0 2.11.1 2.1.214 - 4.11.0 - 1.14.11 + 3.12.4 3.0.5 2.6.12 1.7.7 @@ -113,16 +112,6 @@ ${h2.version} runtime - - net.bytebuddy - byte-buddy - ${bytebuddy.version} - - - net.bytebuddy - byte-buddy-agent - ${bytebuddy.version} - org.springframework.cloud spring-cloud-starter-consul-config diff --git a/infra/common/pom.xml b/infra/common/pom.xml index b6397481..607b5caf 100644 --- a/infra/common/pom.xml +++ b/infra/common/pom.xml @@ -48,6 +48,11 @@ mockito-core test + + org.mockito + mockito-inline + test + org.apache.tomcat.embed tomcat-embed-core diff --git a/infra/common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/infra/common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker deleted file mode 100644 index 1f0955d4..00000000 --- a/infra/common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ /dev/null @@ -1 +0,0 @@ -mock-maker-inline diff --git a/pom.xml b/pom.xml index 8ab17d7c..b6dff1a5 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 2.0.0-SNAPSHOT - 4.11.0 + 3.12.4 1.8 true false @@ -101,6 +101,11 @@ mockito-core ${mockito.version} + + org.mockito + mockito-inline + ${mockito.version} + org.mockito mockito-junit-jupiter diff --git a/threadpool/core/pom.xml b/threadpool/core/pom.xml index 41b1d3b0..903c73de 100644 --- a/threadpool/core/pom.xml +++ b/threadpool/core/pom.xml @@ -41,7 +41,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/threadpool/core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/threadpool/core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker deleted file mode 100644 index be144a36..00000000 --- a/threadpool/core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ /dev/null @@ -1,2 +0,0 @@ -mock-maker-inline -