github/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !589 from 邓超/springboot3

Browse Source
This commit is contained in:
邓超 2026-06-11 09:44:09 +00:00 committed by Gitee
commit fb1d952d98
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pom.xml
View File

@ -17,7 +17,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version> <java.version>17</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version> <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<spring-boot.version>3.5.14</spring-boot.version> <spring-boot.version>3.5.15</spring-boot.version>
<shiro.version>2.2.0</shiro.version> <shiro.version>2.2.0</shiro.version>
<mybatis-spring-boot.version>3.0.5</mybatis-spring-boot.version> <mybatis-spring-boot.version>3.0.5</mybatis-spring-boot.version>
<thymeleaf.extras.shiro.version>2.1.0</thymeleaf.extras.shiro.version> <thymeleaf.extras.shiro.version>2.1.0</thymeleaf.extras.shiro.version>
@ -29,7 +29,7 @@
<oshi.version>7.3.0</oshi.version> <oshi.version>7.3.0</oshi.version>
<commons.io.version>2.22.0</commons.io.version> <commons.io.version>2.22.0</commons.io.version>
<poi.version>4.1.2</poi.version> <poi.version>4.1.2</poi.version>
<velocity.version>2.3</velocity.version> <velocity.version>2.4.1</velocity.version>
<springdoc.version>2.8.17</springdoc.version> <springdoc.version>2.8.17</springdoc.version>
</properties> </properties>
@ -225,11 +225,10 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version> <version>3.15.0</version>
<configuration> <configuration>
<parameters>true</parameters> <parameters>true</parameters>
<source>${java.version}</source> <release>${java.version}</release>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
</configuration> </configuration>
</plugin> </plugin>
@ -266,4 +265,4 @@
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
</project> </project>

4
ruoyi-admin/pom.xml
View File

@ -74,7 +74,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version> <version>3.5.1</version>
<configuration> <configuration>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName> <warName>${project.artifactId}</warName>
@ -117,4 +117,4 @@
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
</build> </build>
</project> </project>