diff --git a/pom.xml b/pom.xml index a719a0f17eed470f29c091069acf9c59b4b811dd..a8d6099ce28e407f805ad01511682496d2e999f9 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ 2.3.3 2.1.0 2.0.45 - 2.9.8 + 2.18.0 6.6.3 - 2.11.0 + 2.17.0 3.2.2 5.2.3 - 4.5.2 + 4.5.14 2.3 0.12.5 4.5.0 @@ -41,33 +41,26 @@ 2.3.1 4.0.5 2.1.0 - 6.0.0 - org.springframework.boot - spring-boot-dependencies + spring-boot-starter-parent ${spring-boot.version} pom import - + org.mybatis.spring.boot mybatis-spring-boot-starter ${mybatis-spring-boot.version} - - org.mybatis - mybatis - 3.5.16 - @@ -86,7 +79,6 @@ ${jaxb.version} - com.mysql @@ -115,7 +107,6 @@ transactions-spring-boot3-starter ${transactions.version} - javax.transaction jta @@ -134,6 +125,13 @@ com.github.pagehelper pagehelper-spring-boot-starter ${pagehelper.boot.version} + + + + org.mybatis + mybatis + + @@ -238,12 +236,6 @@ - - jakarta.servlet - jakarta.servlet-api - ${jakarta.version} - - com.ruoyi @@ -315,17 +307,18 @@ pom - - - - - + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 true ${java.version} @@ -336,6 +329,7 @@ + public @@ -347,6 +341,7 @@ + public diff --git a/ruoyi-auth/ruoyi-auth-common/pom.xml b/ruoyi-auth/ruoyi-auth-common/pom.xml index 42a6b6fefd2f24c1b52ebbd26a815dfe424e653c..1de7196cbe78078a81d2f913bed9cc2c7b95e0fa 100644 --- a/ruoyi-auth/ruoyi-auth-common/pom.xml +++ b/ruoyi-auth/ruoyi-auth-common/pom.xml @@ -27,6 +27,7 @@ org.apache.httpcomponents httpclient + \ No newline at end of file diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 52edb2704b6cfa70df1424d50b61c2b9f158e210..8472bb90c0ffabab317cfb36983bd91490b071a5 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -16,16 +16,10 @@ - - - org.springframework - spring-context-support - - - org.springframework - spring-web + org.springframework.boot + spring-boot-starter-web @@ -52,12 +46,6 @@ commons-lang3 - - - com.fasterxml.jackson.core - jackson-databind - - com.fasterxml.jackson.datatype @@ -88,12 +76,6 @@ poi-ooxml - - - org.yaml - snakeyaml - - io.jsonwebtoken @@ -141,12 +123,7 @@ UserAgentUtils - - jakarta.servlet - jakarta.servlet-api - - - + org.mybatis.spring.boot mybatis-spring-boot-starter diff --git a/ruoyi-plugins/pom.xml b/ruoyi-plugins/pom.xml index f956740e6e8f214b7315c61c44e2b405ab40bdcd..358faf8033fe6c3cb0d585bdf4e9e5f7641c04c6 100644 --- a/ruoyi-plugins/pom.xml +++ b/ruoyi-plugins/pom.xml @@ -11,9 +11,8 @@ ruoyi-plugins - 3.8.8.3.1 3.10.8 - 3.5.5 + 3.5.8 @@ -28,22 +27,10 @@ ${ehcache.version} - - com.baomidou mybatis-plus-spring-boot3-starter - 3.5.7 + ${mybatis-plus.version} diff --git a/ruoyi-plugins/ruoyi-mybatis-interceptor/pom.xml b/ruoyi-plugins/ruoyi-mybatis-interceptor/pom.xml index 5d1386233fa727e73da96b5d19baa9e12bad9d8a..61bedba8951de0966c60d54cfea418b61480e065 100644 --- a/ruoyi-plugins/ruoyi-mybatis-interceptor/pom.xml +++ b/ruoyi-plugins/ruoyi-mybatis-interceptor/pom.xml @@ -11,11 +11,6 @@ ruoyi-mybatis-interceptor - - 19 - 19 - UTF-8 - com.ruoyi diff --git a/ruoyi-plugins/ruoyi-mybatis-jpa/pom.xml b/ruoyi-plugins/ruoyi-mybatis-jpa/pom.xml index 6994e530136e5e5ae5e230c7e7d3a4606264ef04..5b96eed0384a3245d7b5eb7e8284c2c1ddbe1edb 100644 --- a/ruoyi-plugins/ruoyi-mybatis-jpa/pom.xml +++ b/ruoyi-plugins/ruoyi-mybatis-jpa/pom.xml @@ -22,11 +22,9 @@ ruoyi-common - com.baomidou mybatis-plus-spring-boot3-starter - true diff --git a/ruoyi-plugins/ruoyi-mybatis-plus/pom.xml b/ruoyi-plugins/ruoyi-mybatis-plus/pom.xml index b3ab16b96b29163a0d1932b4dd5ca314e639039a..04d3b1336f51affcbe30442212dd98ff4a2e4897 100644 --- a/ruoyi-plugins/ruoyi-mybatis-plus/pom.xml +++ b/ruoyi-plugins/ruoyi-mybatis-plus/pom.xml @@ -22,12 +22,11 @@ ruoyi-common - + com.baomidou mybatis-plus-spring-boot3-starter -