sz-team/supervision-test-repo
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!3 修改POM文件，实现父pom统一做版本裁决，去除掉子pom里耦合的具体版本信息，并且部分版本变量放在父pom里做管理

Browse Source 
Merge pull request !3 from new_new_new/feature/maven-pom-improve
This commit is contained in:
new_new_new
2026-04-13 09:01:04 +00:00
committed by Gitee
parent 0f4d1f528f 74e860747e
commit affd4d4adb
17 changed files with 77 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.mvn/maven.config
+1
View File
@@ -0,0 +1 @@
-Drevision=3.8.0
jeecg-boot-base-core/pom.xml
+3 -5
View File
@@ -4,12 +4,10 @@
<parent>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-parent</artifactId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jeecg-boot-base-core</artifactId>
<version>3.8.1</version>
<repositories>
<repository>
<id>aliyun</id>
@@ -98,7 +96,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-langs</artifactId>
<version>2.7.1</version>
<version>${commons-langs.version}</version>
</dependency>
<!-- freemarker -->
<dependency>
@@ -269,7 +267,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
<version>${xerces.version}</version>
<optional>true</optional>
</dependency>
jeecg-boot-module/jeecg-boot-module-airag/pom.xml
+2 -9
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-module</artifactId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<artifactId>jeecg-boot-module-airag</artifactId>
@@ -30,13 +30,6 @@
</repository>
</repositories>
<properties>
<kotlin.version>1.6.21</kotlin.version>
<liteflow.version>2.12.4.1</liteflow.version>
<langchain4j.version>0.35.0</langchain4j.version>
<apache-tika.version>2.9.1</apache-tika.version>
</properties>
<dependencies>
<!-- system单体 api-->
<dependency>
@@ -58,7 +51,7 @@
<dependency>
<groupId>org.jeecgframework</groupId>
<artifactId>ai-flow</artifactId>
<version>1.1.0</version>
<version>${ai-flow.version}</version>
</dependency>
<!-- liteflow -->
<dependency>
jeecg-boot-module/jeecg-boot-module-joa-flowable/pom.xml
+5 -10
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-module</artifactId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<description>此模块属于商业功能范畴，需要购买商业授权才可使用，禁止盗卖、泄露、传播商业源码和商业资料，双方签订合同有保密协议，违者收回商业授权，并追究法律责任</description>
@@ -36,10 +36,6 @@
<developerConnection>http://www.guojusoft.com</developerConnection>
<url>http://www.jeecg.com/vip</url>
</scm>
<properties>
<flowable.version>6.8.0</flowable.version>
</properties>
<repositories>
<repository>
@@ -147,7 +143,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-langs</artifactId>
<version>2.7.1</version>
<version>${commons-langs.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.commons</groupId>-->
@@ -195,13 +191,13 @@
<dependency>
<groupId>com.qiniu</groupId>
<artifactId>qiniu-uapp-sdk</artifactId>
<version>7.4.0</version>
<version>${qiniu-uapp-sdk.version}</version>
</dependency>
<!-- 百度SDK （OCR） -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-langs</artifactId>
<version>2.7.1</version>
<version>${commons-langs.version}</version>
</dependency>
<dependency>
<groupId>com.baidu.aip</groupId>
@@ -237,8 +233,7 @@
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-module-bpm-flowable</artifactId>
<version>3.8.0</version>
<!-- <version>${jeecgboot.version}</version>-->
<version>${revision}</version>
</dependency>
</dependencies>
</project>
jeecg-boot-module/jeecg-module-demo/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>jeecg-boot-module</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
jeecg-boot-module/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>jeecg-boot-parent</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
jeecg-boot-platform/jeecg-boot-module-airag-flow/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-platform</artifactId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<artifactId>jeecg-boot-module-airag-flow</artifactId>
jeecg-boot-platform/jeecg-boot-module-bpm-flowable/pom.xml
+3 -3
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-platform</artifactId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<description>此模块属于商业功能范畴，需要购买商业授权才可使用，禁止盗卖、泄露、传播商业源码和商业资料，双方签订合同有保密协议，违者收回商业授权，并追究法律责任</description>
@@ -115,14 +115,14 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-langs</artifactId>
<version>2.7.1</version>
<version>${commons-langs.version}</version>
</dependency>
<!-- jsoup -->
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.11.3</version>
<version>${jsoup.version}</version>
</dependency>
<!-- dom4j -->
<dependency>
jeecg-boot-platform/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>jeecg-boot-parent</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
jeecg-module-supervision/pom.xml
+2 -3
View File
@@ -5,19 +5,18 @@
<parent>
<artifactId>jeecg-boot-parent</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>3.8.1</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jeecg-module-supervision</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>3.8.1</version>
<dependencies>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-base-core</artifactId>
<version>3.8.1</version>
<version>${revision}</version>
</dependency>
</dependencies>
</project>
jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>jeecg-system-api</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
jeecg-module-system/jeecg-system-api/jeecg-system-local-api/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>jeecg-system-api</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
jeecg-module-system/jeecg-system-api/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>jeecg-module-system</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
jeecg-module-system/jeecg-system-biz/pom.xml
+1 -3
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-module-system</artifactId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,12 +35,10 @@
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-module-joa-flowable</artifactId>
<version>${jeecgboot.version}</version>
</dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-module-airag</artifactId>
<version>${jeecgboot.version}</version>
</dependency>
</dependencies>
jeecg-module-system/jeecg-system-start/pom.xml
+1 -4
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>jeecg-module-system</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -16,19 +16,16 @@
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-system-biz</artifactId>
<version>${jeecgboot.version}</version>
</dependency>
<!-- DEMO 示例模块 -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-module-demo</artifactId>
<version>${jeecgboot.version}</version>
</dependency>
<!-- supervision 督办模块 -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-module-supervision</artifactId>
<version>3.8.1</version>
</dependency>
<!-- flyway 数据库自动升级 -->
jeecg-module-system/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>jeecg-boot-parent</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>3.8.0</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pom.xml
+51 -12
View File
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-parent</artifactId>
<version>3.8.0</version>
<version>${revision}</version>
<packaging>pom</packaging>
<parent>
@@ -39,6 +39,7 @@
<properties>
<jeecgboot.version>3.8.0</jeecgboot.version>
<revision>3.8.0</revision>
<!-- JDK版本支持17和1.8 -->
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -90,6 +91,23 @@
<!-- Log4j2爆雷漏洞 -->
<log4j2.version>2.17.0</log4j2.version>
<logback.version>1.2.13</logback.version>
<commons-langs.version>2.7.1</commons-langs.version>
<xerces.version>2.12.2</xerces.version>
<kotlin.version>1.6.21</kotlin.version>
<liteflow.version>2.12.4.1</liteflow.version>
<langchain4j.version>0.35.0</langchain4j.version>
<apache-tika.version>2.9.1</apache-tika.version>
<ai-flow.version>1.1.0</ai-flow.version>
<flowable.version>6.8.0</flowable.version>
<qiniu-uapp-sdk.version>7.4.0</qiniu-uapp-sdk.version>
<jsoup.version>1.11.3</jsoup.version>
</properties>
<modules>
@@ -98,7 +116,6 @@
<module>jeecg-boot-module</module>
<module>jeecg-module-supervision</module>
<module>jeecg-boot-platform</module>
<!-- <module>jeecg-boot-platform</module> -->
</modules>
<repositories>
@@ -196,39 +213,61 @@
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-system-biz</artifactId>
<version>${jeecgboot.version}</version>
<version>${revision}</version>
</dependency>
<!-- DEMO 示例模块 -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-module-demo</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-module-joa-flowable</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-module-airag</artifactId>
<version>${revision}</version>
</dependency>
<!-- supervision 督办模块 -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-module-supervision</artifactId>
<version>${revision}</version>
</dependency>
<!-- jeecg tools -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-common</artifactId>
<version>${jeecgboot.version}</version>
<version>${revision}</version>
</dependency>
<!-- jeecg core -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-base-core</artifactId>
<version>${jeecgboot.version}</version>
<version>${revision}</version>
</dependency>
<!-- system 单体 api -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-system-local-api</artifactId>
<version>${jeecgboot.version}</version>
<version>${revision}</version>
</dependency>
<!-- system 微服务 api -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-system-cloud-api</artifactId>
<version>${jeecgboot.version}</version>
<version>${revision}</version>
</dependency>
<!--微服务启动依赖-->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-starter-cloud</artifactId>
<version>${jeecgboot.version}</version>
<version>${revision}</version>
</dependency>
<!--xxl-job定时任务-->
<dependency>
@@ -240,18 +279,18 @@
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-starter-lock</artifactId>
<version>${jeecgboot.version}</version>
<version>${revision}</version>
</dependency>
<!--rabbitmq消息队列-->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-starter-rabbitmq</artifactId>
<version>${jeecgboot.version}</version>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-starter-rocketmq</artifactId>
<version>${jeecgboot.version}</version>
<version>${revision}</version>
</dependency>
<!--分库分表shardingsphere-->
<dependency>
@@ -263,7 +302,7 @@
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-starter-mongon</artifactId>
<version>${jeecgboot.version}</version>
<version>${revision}</version>
</dependency>
<!-- 七牛云SDK -->