github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/springboot3' into springboot3_sas 

# Conflicts:
#	jeecg-boot/jeecg-boot-base-core/pom.xml
springboot3_sas
JEECG 2025-07-25 14:10:51 +08:00
parent 9cca8f8719 0d9f9a04cc
commit b3ed442b55
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-boot/jeecg-boot-base-core/pom.xml
View File

@ -218,12 +218,12 @@
<artifactId>spring-security-cas</artifactId>
</dependency>
<!-- <dependency>
<groupId>com.github.xiaoymin</groupId>
<dependency>
<groupId>com.github.xingfudeshi</groupId>
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
<version>${knife4j-spring-boot-starter.version}</version>
</dependency>-->
<!-- knife4j 升级springboot3.4.5报错 -->
</dependency>
<!-- knife4j 升级springboot3.4.5报错
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-ui</artifactId>
@ -233,7 +233,7 @@
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.7.0</version>
</dependency>
</dependency>-->
<!-- 代码生成器 -->
<!-- 如下载失败，请参考此文档 https://help.jeecg.com/java/setup/maven.html -->

2
jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml
View File

@ -72,7 +72,7 @@
<!-- Swagger API文档 -->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<groupId>com.github.xingfudeshi</groupId>
<artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
<version>${knife4j-spring-boot-starter.version}</version>
</dependency>

2
jeecg-boot/pom.xml
View File

@ -43,7 +43,7 @@
<aviator.version>5.2.6</aviator.version>
<pegdown.version>1.6.0</pegdown.version>
<commonmark.version>0.17.0</commonmark.version>
<knife4j-spring-boot-starter.version>4.5.0</knife4j-spring-boot-starter.version>
<knife4j-spring-boot-starter.version>4.6.0</knife4j-spring-boot-starter.version>
<!-- 数据库驱动 -->
<postgresql.version>42.2.25</postgresql.version>
<ojdbc6.version>11.2.0.3</ojdbc6.version>