diff --git a/pom.xml b/pom.xml index 2591d51c..6989e1cb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ org.dromara ruoyi-cloud-plus - 1.6.0 + ${revision} RuoYi-Cloud-Plus https://gitee.com/dromara/RuoYi-Cloud-Plus RuoYi-Cloud-Plus微服务系统 - 1.6.0 + 2.X-BETA UTF-8 UTF-8 1.8 @@ -106,7 +106,7 @@ org.dromara ruoyi-common-alibaba-bom - ${ruoyi.version} + ${revision} pom import @@ -133,7 +133,7 @@ org.dromara ruoyi-common-bom - ${ruoyi.version} + ${revision} pom import @@ -142,7 +142,7 @@ org.dromara ruoyi-api-bom - ${ruoyi.version} + ${revision} pom import diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index cfd5cbdd..2701751b 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-cloud-plus - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-api/ruoyi-api-bom/pom.xml b/ruoyi-api/ruoyi-api-bom/pom.xml index 680cab02..b8459a78 100644 --- a/ruoyi-api/ruoyi-api-bom/pom.xml +++ b/ruoyi-api/ruoyi-api-bom/pom.xml @@ -8,26 +8,30 @@ org.dromara ruoyi-api-bom pom - 1.6.0 + ${revision} ruoyi-api-bom api依赖项 + + 2.X-BETA + + org.dromara ruoyi-api-system - ${project.version} + ${revision} org.dromara ruoyi-api-resource - ${project.version} + ${revision} diff --git a/ruoyi-api/ruoyi-api-resource/pom.xml b/ruoyi-api/ruoyi-api-resource/pom.xml index d2480f1d..4a4f7289 100644 --- a/ruoyi-api/ruoyi-api-resource/pom.xml +++ b/ruoyi-api/ruoyi-api-resource/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-api - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 4f76d9ff..02958f35 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-api - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 44b47529..fc312a10 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-cloud-plus - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index fc836c15..c9248597 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-cloud-plus - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml index 5496a042..2b96a16c 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml @@ -6,7 +6,7 @@ org.dromara ruoyi-common-alibaba-bom - 1.6.0 + ${revision} pom @@ -14,6 +14,7 @@ + 2.X-BETA 2021.0.5.0 1.8.6 1.6.1 diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index 1064d247..cfe4905f 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -6,179 +6,183 @@ org.dromara ruoyi-common-bom - 1.6.0 + ${revision} pom ruoyi-common-bom common依赖项 + + 2.X-BETA + + org.dromara ruoyi-common-core - ${project.version} + ${revision} org.dromara ruoyi-common-doc - ${project.version} + ${revision} org.dromara ruoyi-common-security - ${project.version} + ${revision} org.dromara ruoyi-common-satoken - ${project.version} + ${revision} org.dromara ruoyi-common-log - ${project.version} + ${revision} org.dromara ruoyi-common-dict - ${project.version} + ${revision} org.dromara ruoyi-common-excel - ${project.version} + ${revision} org.dromara ruoyi-common-redis - ${project.version} + ${revision} org.dromara ruoyi-common-web - ${project.version} + ${revision} org.dromara ruoyi-common-mybatis - ${project.version} + ${revision} org.dromara ruoyi-common-job - ${project.version} + ${revision} org.dromara ruoyi-common-dubbo - ${project.version} + ${revision} org.dromara ruoyi-common-seata - ${project.version} + ${revision} org.dromara ruoyi-common-loadbalancer - ${project.version} + ${revision} org.dromara ruoyi-common-oss - ${project.version} + ${revision} org.dromara ruoyi-common-idempotent - ${project.version} + ${revision} org.dromara ruoyi-common-mail - ${project.version} + ${revision} org.dromara ruoyi-common-sms - ${project.version} + ${revision} org.dromara ruoyi-common-logstash - ${project.version} + ${revision} org.dromara ruoyi-common-elasticsearch - ${project.version} + ${revision} org.dromara ruoyi-common-sentinel - ${project.version} + ${revision} org.dromara ruoyi-common-skylog - ${project.version} + ${revision} org.dromara ruoyi-common-prometheus - ${project.version} + ${revision} org.dromara ruoyi-common-translation - ${project.version} + ${revision} org.dromara ruoyi-common-encrypt - ${project.version} + ${revision} org.dromara ruoyi-common-tenant - ${project.version} + ${revision} diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 35ccd38a..557b5f78 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-dict/pom.xml b/ruoyi-common/ruoyi-common-dict/pom.xml index fd5aefe6..6cf4efce 100644 --- a/ruoyi-common/ruoyi-common-dict/pom.xml +++ b/ruoyi-common/ruoyi-common-dict/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-doc/pom.xml b/ruoyi-common/ruoyi-common-doc/pom.xml index 3443c0a2..15f683e4 100644 --- a/ruoyi-common/ruoyi-common-doc/pom.xml +++ b/ruoyi-common/ruoyi-common-doc/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-dubbo/pom.xml b/ruoyi-common/ruoyi-common-dubbo/pom.xml index 989c2f1d..1a522fa2 100644 --- a/ruoyi-common/ruoyi-common-dubbo/pom.xml +++ b/ruoyi-common/ruoyi-common-dubbo/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-elasticsearch/pom.xml b/ruoyi-common/ruoyi-common-elasticsearch/pom.xml index 9a875b9a..1e542ff2 100644 --- a/ruoyi-common/ruoyi-common-elasticsearch/pom.xml +++ b/ruoyi-common/ruoyi-common-elasticsearch/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-encrypt/pom.xml b/ruoyi-common/ruoyi-common-encrypt/pom.xml index 8eee91cc..ac8616be 100644 --- a/ruoyi-common/ruoyi-common-encrypt/pom.xml +++ b/ruoyi-common/ruoyi-common-encrypt/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-excel/pom.xml b/ruoyi-common/ruoyi-common-excel/pom.xml index a8aaeab0..4f0324d4 100644 --- a/ruoyi-common/ruoyi-common-excel/pom.xml +++ b/ruoyi-common/ruoyi-common-excel/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/ruoyi-common/ruoyi-common-idempotent/pom.xml index 289006f5..99a4f08a 100644 --- a/ruoyi-common/ruoyi-common-idempotent/pom.xml +++ b/ruoyi-common/ruoyi-common-idempotent/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-job/pom.xml b/ruoyi-common/ruoyi-common-job/pom.xml index afbb2273..a101447f 100644 --- a/ruoyi-common/ruoyi-common-job/pom.xml +++ b/ruoyi-common/ruoyi-common-job/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-loadbalancer/pom.xml b/ruoyi-common/ruoyi-common-loadbalancer/pom.xml index f4a498ce..1509a44f 100644 --- a/ruoyi-common/ruoyi-common-loadbalancer/pom.xml +++ b/ruoyi-common/ruoyi-common-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index e95e215e..9040ec4f 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-logstash/pom.xml b/ruoyi-common/ruoyi-common-logstash/pom.xml index c9bb39aa..36ad275d 100644 --- a/ruoyi-common/ruoyi-common-logstash/pom.xml +++ b/ruoyi-common/ruoyi-common-logstash/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-mail/pom.xml b/ruoyi-common/ruoyi-common-mail/pom.xml index ab4167a9..da072928 100644 --- a/ruoyi-common/ruoyi-common-mail/pom.xml +++ b/ruoyi-common/ruoyi-common-mail/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml index 55a24a91..54803a30 100644 --- a/ruoyi-common/ruoyi-common-mybatis/pom.xml +++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-oss/pom.xml b/ruoyi-common/ruoyi-common-oss/pom.xml index 884dc8fb..37b56781 100644 --- a/ruoyi-common/ruoyi-common-oss/pom.xml +++ b/ruoyi-common/ruoyi-common-oss/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-prometheus/pom.xml b/ruoyi-common/ruoyi-common-prometheus/pom.xml index 1aea0e07..319bed40 100644 --- a/ruoyi-common/ruoyi-common-prometheus/pom.xml +++ b/ruoyi-common/ruoyi-common-prometheus/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index 455a75bf..7490b381 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/ruoyi-common/ruoyi-common-satoken/pom.xml index 0e416ed5..03b02f45 100644 --- a/ruoyi-common/ruoyi-common-satoken/pom.xml +++ b/ruoyi-common/ruoyi-common-satoken/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 44ec011e..da7451e7 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 2c64bb88..53680553 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sentinel/pom.xml b/ruoyi-common/ruoyi-common-sentinel/pom.xml index e5d2a39f..3185baf7 100644 --- a/ruoyi-common/ruoyi-common-sentinel/pom.xml +++ b/ruoyi-common/ruoyi-common-sentinel/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-skylog/pom.xml b/ruoyi-common/ruoyi-common-skylog/pom.xml index 45274901..212bcf05 100644 --- a/ruoyi-common/ruoyi-common-skylog/pom.xml +++ b/ruoyi-common/ruoyi-common-skylog/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sms/pom.xml b/ruoyi-common/ruoyi-common-sms/pom.xml index d8a70655..40e01043 100644 --- a/ruoyi-common/ruoyi-common-sms/pom.xml +++ b/ruoyi-common/ruoyi-common-sms/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-tenant/pom.xml b/ruoyi-common/ruoyi-common-tenant/pom.xml index 794e7c61..2b87bf96 100644 --- a/ruoyi-common/ruoyi-common-tenant/pom.xml +++ b/ruoyi-common/ruoyi-common-tenant/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-translation/pom.xml b/ruoyi-common/ruoyi-common-translation/pom.xml index 113bd73c..ea7b79e6 100644 --- a/ruoyi-common/ruoyi-common-translation/pom.xml +++ b/ruoyi-common/ruoyi-common-translation/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/ruoyi-common/ruoyi-common-web/pom.xml index 63b013f6..84c04fc2 100644 --- a/ruoyi-common/ruoyi-common-web/pom.xml +++ b/ruoyi-common/ruoyi-common-web/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-common - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-example/pom.xml b/ruoyi-example/pom.xml index b5ddcdbc..eebbb562 100644 --- a/ruoyi-example/pom.xml +++ b/ruoyi-example/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-cloud-plus - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-example/ruoyi-demo/pom.xml b/ruoyi-example/ruoyi-demo/pom.xml index 34f778cd..3c557349 100644 --- a/ruoyi-example/ruoyi-demo/pom.xml +++ b/ruoyi-example/ruoyi-demo/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-example - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-example/ruoyi-stream-mq/pom.xml b/ruoyi-example/ruoyi-stream-mq/pom.xml index 3f45f43f..4e3f8463 100644 --- a/ruoyi-example/ruoyi-stream-mq/pom.xml +++ b/ruoyi-example/ruoyi-stream-mq/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-example - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index f00d299c..a96987e9 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-cloud-plus - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index d6218015..0980f601 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-cloud-plus - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 01f19676..04b27b99 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-modules - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 020a7e47..e5ec5804 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-modules - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-modules/ruoyi-resource/pom.xml b/ruoyi-modules/ruoyi-resource/pom.xml index eac78e98..37b3a2d5 100644 --- a/ruoyi-modules/ruoyi-resource/pom.xml +++ b/ruoyi-modules/ruoyi-resource/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-modules - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 72f91c2f..496bb22e 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ org.dromara ruoyi-modules - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index 90899668..a940ddad 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-cloud-plus - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 82750b96..a55ec678 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-visual - 1.6.0 + ${revision} 4.0.0 diff --git a/ruoyi-visual/ruoyi-nacos/pom.xml b/ruoyi-visual/ruoyi-nacos/pom.xml index 59d2bec1..54bd079a 100644 --- a/ruoyi-visual/ruoyi-nacos/pom.xml +++ b/ruoyi-visual/ruoyi-nacos/pom.xml @@ -21,7 +21,7 @@ org.dromara ruoyi-visual - 1.6.0 + ${revision} ruoyi-nacos jar diff --git a/ruoyi-visual/ruoyi-seata-server/pom.xml b/ruoyi-visual/ruoyi-seata-server/pom.xml index a3aa8fca..4a44cbc4 100644 --- a/ruoyi-visual/ruoyi-seata-server/pom.xml +++ b/ruoyi-visual/ruoyi-seata-server/pom.xml @@ -20,7 +20,7 @@ org.dromara ruoyi-visual - 1.6.0 + ${revision} 4.0.0 ruoyi-seata-server diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml index 8a761272..6e3e8044 100644 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml +++ b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml @@ -6,7 +6,7 @@ org.dromara ruoyi-visual - 1.6.0 + ${revision} ruoyi-sentinel-dashboard diff --git a/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml b/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml index c182295d..4a38ac22 100644 --- a/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml +++ b/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-visual - 1.6.0 + ${revision} ruoyi-xxl-job-admin jar