diff --git a/.mvn/maven.config b/.mvn/maven.config index 915b463..921e53f 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1 +1 @@ --Drevision=3.8.0 \ No newline at end of file +-DjeecgProjectVersion=3.8.0 \ No newline at end of file diff --git a/jeecg-boot-base-core/pom.xml b/jeecg-boot-base-core/pom.xml index 0c563fe..3fbe879 100644 --- a/jeecg-boot-base-core/pom.xml +++ b/jeecg-boot-base-core/pom.xml @@ -4,7 +4,7 @@ org.jeecgframework.boot jeecg-boot-parent - ${revision} + ${jeecgProjectVersion} 4.0.0 jeecg-boot-base-core diff --git a/jeecg-boot-module/jeecg-boot-module-airag/pom.xml b/jeecg-boot-module/jeecg-boot-module-airag/pom.xml index 6ca61d2..9e5879d 100644 --- a/jeecg-boot-module/jeecg-boot-module-airag/pom.xml +++ b/jeecg-boot-module/jeecg-boot-module-airag/pom.xml @@ -6,7 +6,7 @@ org.jeecgframework.boot jeecg-boot-module - ${revision} + ${jeecgProjectVersion} jeecg-boot-module-airag diff --git a/jeecg-boot-module/jeecg-boot-module-joa-flowable/pom.xml b/jeecg-boot-module/jeecg-boot-module-joa-flowable/pom.xml index 36fbae0..986fe5e 100644 --- a/jeecg-boot-module/jeecg-boot-module-joa-flowable/pom.xml +++ b/jeecg-boot-module/jeecg-boot-module-joa-flowable/pom.xml @@ -5,7 +5,7 @@ org.jeecgframework.boot jeecg-boot-module - ${revision} + ${jeecgProjectVersion} 此模块属于商业功能范畴,需要购买商业授权才可使用,禁止盗卖、泄露、传播商业源码和商业资料,双方签订合同有保密协议,违者收回商业授权,并追究法律责任 @@ -229,11 +229,16 @@ - org.jeecgframework.boot jeecg-boot-module-bpm-flowable - ${revision} + ${jeecgProjectVersion} + + com.baomidou + mybatis-plus-extension + ${mybatis-plus.version} + compile + diff --git a/jeecg-boot-module/jeecg-module-demo/pom.xml b/jeecg-boot-module/jeecg-module-demo/pom.xml index 45bf48c..ad64971 100644 --- a/jeecg-boot-module/jeecg-module-demo/pom.xml +++ b/jeecg-boot-module/jeecg-module-demo/pom.xml @@ -5,7 +5,7 @@ jeecg-boot-module org.jeecgframework.boot - ${revision} + ${jeecgProjectVersion} 4.0.0 diff --git a/jeecg-boot-module/pom.xml b/jeecg-boot-module/pom.xml index 49a263f..dcfafbc 100644 --- a/jeecg-boot-module/pom.xml +++ b/jeecg-boot-module/pom.xml @@ -5,7 +5,7 @@ jeecg-boot-parent org.jeecgframework.boot - ${revision} + ${jeecgProjectVersion} 4.0.0 diff --git a/jeecg-boot-platform/jeecg-boot-module-airag-flow/pom.xml b/jeecg-boot-platform/jeecg-boot-module-airag-flow/pom.xml index 5f68845..7f80fb4 100644 --- a/jeecg-boot-platform/jeecg-boot-module-airag-flow/pom.xml +++ b/jeecg-boot-platform/jeecg-boot-module-airag-flow/pom.xml @@ -6,7 +6,7 @@ org.jeecgframework.boot jeecg-boot-platform - ${revision} + ${jeecgProjectVersion} jeecg-boot-module-airag-flow @@ -38,11 +38,7 @@ http://www.guojusoft.com http://www.jeecg.com/vip - - - 1.6.21 - 2.12.4.1 - + diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/pom.xml b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/pom.xml index 40281a5..6395461 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/pom.xml +++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/pom.xml @@ -5,7 +5,7 @@ org.jeecgframework.boot jeecg-boot-platform - ${revision} + ${jeecgProjectVersion} 此模块属于商业功能范畴,需要购买商业授权才可使用,禁止盗卖、泄露、传播商业源码和商业资料,双方签订合同有保密协议,违者收回商业授权,并追究法律责任 diff --git a/jeecg-boot-platform/pom.xml b/jeecg-boot-platform/pom.xml index 1a56e3b..b97848a 100644 --- a/jeecg-boot-platform/pom.xml +++ b/jeecg-boot-platform/pom.xml @@ -5,7 +5,7 @@ jeecg-boot-parent org.jeecgframework.boot - ${revision} + ${jeecgProjectVersion} 4.0.0 diff --git a/jeecg-module-supervision/pom.xml b/jeecg-module-supervision/pom.xml index 922c7c2..43da533 100644 --- a/jeecg-module-supervision/pom.xml +++ b/jeecg-module-supervision/pom.xml @@ -5,7 +5,7 @@ jeecg-boot-parent org.jeecgframework.boot - ${revision} + ${jeecgProjectVersion} 4.0.0 @@ -16,7 +16,6 @@ org.jeecgframework.boot jeecg-boot-base-core - ${revision} diff --git a/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/pom.xml b/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/pom.xml index 234e024..db1f54d 100644 --- a/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/pom.xml +++ b/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/pom.xml @@ -5,7 +5,7 @@ jeecg-system-api org.jeecgframework.boot - ${revision} + ${jeecgProjectVersion} 4.0.0 diff --git a/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/pom.xml b/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/pom.xml index c700df0..d483e9a 100644 --- a/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/pom.xml +++ b/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/pom.xml @@ -5,7 +5,7 @@ jeecg-system-api org.jeecgframework.boot - ${revision} + ${jeecgProjectVersion} 4.0.0 diff --git a/jeecg-module-system/jeecg-system-api/pom.xml b/jeecg-module-system/jeecg-system-api/pom.xml index d62c581..0be72d5 100644 --- a/jeecg-module-system/jeecg-system-api/pom.xml +++ b/jeecg-module-system/jeecg-system-api/pom.xml @@ -5,7 +5,7 @@ jeecg-module-system org.jeecgframework.boot - ${revision} + ${jeecgProjectVersion} 4.0.0 diff --git a/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-module-system/jeecg-system-biz/pom.xml index 04a0809..2c7b931 100644 --- a/jeecg-module-system/jeecg-system-biz/pom.xml +++ b/jeecg-module-system/jeecg-system-biz/pom.xml @@ -4,7 +4,7 @@ org.jeecgframework.boot jeecg-module-system - ${revision} + ${jeecgProjectVersion} 4.0.0 diff --git a/jeecg-module-system/jeecg-system-start/pom.xml b/jeecg-module-system/jeecg-system-start/pom.xml index afbbfea..6ecc217 100644 --- a/jeecg-module-system/jeecg-system-start/pom.xml +++ b/jeecg-module-system/jeecg-system-start/pom.xml @@ -5,7 +5,7 @@ jeecg-module-system org.jeecgframework.boot - ${revision} + ${jeecgProjectVersion} 4.0.0 diff --git a/jeecg-module-system/pom.xml b/jeecg-module-system/pom.xml index c4029eb..c1d3d15 100644 --- a/jeecg-module-system/pom.xml +++ b/jeecg-module-system/pom.xml @@ -5,7 +5,7 @@ jeecg-boot-parent org.jeecgframework.boot - ${revision} + ${jeecgProjectVersion} 4.0.0 diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml b/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml index 844fc7e..57422e3 100644 --- a/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml +++ b/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml @@ -5,7 +5,7 @@ jeecg-server-cloud org.jeecgframework.boot - 3.8.0 + ${jeecgProjectVersion} 4.0.0 jeecg-cloud-gateway diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml b/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml index 9acc573..cd0728c 100644 --- a/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml +++ b/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml @@ -5,7 +5,7 @@ jeecg-cloud-nacos jeecg-cloud-nacos nacos启动模块 - 3.8.0 + ${jeecgboot.version} org.springframework.boot diff --git a/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml b/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml index e673256..3e34634 100644 --- a/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml +++ b/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml @@ -5,7 +5,7 @@ jeecg-server-cloud org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml b/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml index 6310ade..08be993 100644 --- a/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml +++ b/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml @@ -5,7 +5,7 @@ jeecg-server-cloud org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 jeecg-system-cloud-start diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/pom.xml index 4ed5e62..0142208 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/pom.xml @@ -5,7 +5,7 @@ jeecg-visual org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 jeecg-cloud-monitor diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml index ee15b5f..dfb5883 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml @@ -5,7 +5,7 @@ jeecg-visual org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} jeecg-cloud-sentinel jeecg-cloud-sentinel diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml index bb15c29..d632bff 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml @@ -5,7 +5,7 @@ jeecg-cloud-test org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 公共测试模块 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml index c5dc19c..cbb86a0 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml @@ -5,7 +5,7 @@ jeecg-cloud-test org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 消息队列测试模块 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/pom.xml index 61c4b02..0f4ce0d 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/pom.xml @@ -5,7 +5,7 @@ org.jeecgframework.boot jeecg-cloud-test - 3.8.0 + ${jeecgboot.version} 4.0.0 消息队列测试模块 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml index 8def08b..eb4ce22 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml @@ -5,7 +5,7 @@ jeecg-cloud-test-seata org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 分布式事务测试模块 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml index 27a44d2..1fb4235 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml @@ -5,7 +5,7 @@ jeecg-cloud-test-seata org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 分布式事务测试模块 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml index 934f202..4da2ac2 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml @@ -5,7 +5,7 @@ jeecg-cloud-test-seata org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 分布式事务测试模块 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml index b96006c..ab2111f 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml @@ -5,7 +5,7 @@ jeecg-cloud-test org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 jeecg-cloud-test-seata diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml index 2e57438..3334e24 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml @@ -5,7 +5,7 @@ jeecg-cloud-test org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xml index 60882d8..4c2072b 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xml @@ -5,7 +5,7 @@ jeecg-visual org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/pom.xml index 79171e4..4df0476 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/pom.xml @@ -5,7 +5,7 @@ jeecg-visual org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 diff --git a/jeecg-server-cloud/jeecg-visual/pom.xml b/jeecg-server-cloud/jeecg-visual/pom.xml index dd1c24b..4a61bcc 100644 --- a/jeecg-server-cloud/jeecg-visual/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/pom.xml @@ -5,7 +5,7 @@ jeecg-server-cloud org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 diff --git a/jeecg-server-cloud/pom.xml b/jeecg-server-cloud/pom.xml index 5a0e508..efee332 100644 --- a/jeecg-server-cloud/pom.xml +++ b/jeecg-server-cloud/pom.xml @@ -5,7 +5,7 @@ jeecg-boot-parent org.jeecgframework.boot - 3.8.0 + ${jeecgboot.version} 4.0.0 diff --git a/pom.xml b/pom.xml index 86d898d..98f720a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.jeecgframework.boot jeecg-boot-parent - ${revision} + ${jeecgProjectVersion} pom @@ -39,7 +39,6 @@ 3.8.0 - 3.8.0 17 UTF-8 @@ -213,61 +212,62 @@ org.jeecgframework.boot jeecg-system-biz - ${revision} + ${jeecgProjectVersion} + org.jeecgframework.boot jeecg-module-demo - ${revision} + ${jeecgProjectVersion} org.jeecgframework.boot jeecg-boot-module-joa-flowable - ${revision} + ${jeecgProjectVersion} org.jeecgframework.boot jeecg-boot-module-airag - ${revision} + ${jeecgProjectVersion} org.jeecgframework.boot jeecg-module-supervision - ${revision} + ${jeecgProjectVersion} org.jeecgframework.boot jeecg-boot-common - ${revision} + ${jeecgProjectVersion} org.jeecgframework.boot jeecg-boot-base-core - ${revision} + ${jeecgProjectVersion} org.jeecgframework.boot jeecg-system-local-api - ${revision} + ${jeecgProjectVersion} org.jeecgframework.boot jeecg-system-cloud-api - ${revision} + ${jeecgProjectVersion} org.jeecgframework.boot jeecg-boot-starter-cloud - ${revision} + ${jeecgProjectVersion} @@ -279,18 +279,18 @@ org.jeecgframework.boot jeecg-boot-starter-lock - ${revision} + ${jeecgProjectVersion} org.jeecgframework.boot jeecg-boot-starter-rabbitmq - ${revision} + ${jeecgProjectVersion} org.jeecgframework.boot jeecg-boot-starter-rocketmq - ${revision} + ${jeecgProjectVersion} @@ -302,7 +302,7 @@ org.jeecgframework.boot jeecg-boot-starter-mongon - ${revision} + ${jeecgProjectVersion}