From bc69d0974a69f348294794db1f6c3dc3cecc5e9c Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Tue, 11 Jun 2024 06:30:39 +0000 Subject: [PATCH 01/54] [maven-release-plugin] prepare release v1.6.1 --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 4 +- caf-data/caf-data-multilang/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 134 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index 850abb7ba..aeefc2bbd 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index f533a0115..60ec585f1 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index fbf826be0..ce85630a4 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index b6da543e5..d15bb9fcb 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index da50fc269..775966ba7 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index e9c0008cd..6da745b0e 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index c4b4bc448..82280bc2a 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index ae3a7208d..5203ed961 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index 280448e58..00a5d7f75 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index 2e605dfd3..4d1f832a6 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 3686e9cfb..12a670759 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 3322f0a02..8e2f37db0 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 5c44d13e6..157cdf7fd 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 9fe6153f5..dfe3cf2ec 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 98432b614..6a37223be 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 @@ -118,7 +118,7 @@ io.iec.edp caf-data-multilang - 1.6.1-SNAPSHOT + 1.6.1 compile diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index f8bd8dbd4..90cf8c343 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.1-SNAPSHOT + 1.6.1 caf-data-multilang diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 0583b1b07..092615667 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index 059b14662..d8608b826 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index df5aaed5f..b4094ad9b 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index b384b9135..0cde1257f 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 0e337e5fc..640751753 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index 9b8e32e01..dd9d1fe29 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index f3a973f93..524912e72 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.1-SNAPSHOT + 1.6.1 caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 551fc6817..a973402b9 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 6a2edbb46..34c8c5419 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index 7d065ed76..e6fc2c960 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index 5a6464547..c0af979f0 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 08428833a..704a53012 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.1-SNAPSHOT + 1.6.1 caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index 5cc4364a2..04090493a 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.1-SNAPSHOT + 1.6.1 caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index f0ff970b4..af3a765f6 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 357794cbb..58676801e 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index 17964fbd0..cddc1dd1e 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 44ff5da36..c5306b5c5 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 0c9ea2734..44c5e6ab7 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index 35093f75b..f7a0e477a 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 7b59c999d..a94d3aac1 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index f2834b67d..bf13e8f06 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 7333aac84..da6b187cd 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 6e2eb1f4b..89114711a 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.1-SNAPSHOT + 1.6.1 caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index ec497b88e..e2f81500f 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index 51052e91b..3153ddaa2 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 0c4274080..e1f5ff2af 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index b3d85715b..27ae98cef 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 588c9389f..bd80876ad 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 5a8dfab95..4cf99ac05 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index e3203aaaa..83bb88cbe 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index cf90e3cb0..7495c50c0 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index 5d9932e56..f1aa752cd 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index 2da20009f..e3953dfd9 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index 16cf9de91..b5e629df4 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 129a82339..a1f5e3dba 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 35dc71382..f1c014273 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 3f599bd0a..24c65a19c 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index 38362b43f..d0b4a3875 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index 42eba3615..16a5337db 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index dab68c7cc..beb3ae300 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index 30056fceb..1ca29b490 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index 8c9ca9c04..7618d0a83 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index 0e416887f..2b59b88f2 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 255232963..2d2458581 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index faecdf06b..0ef36aabf 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 4b669f324..28b806b5e 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 104b7c79c..ca64ee3bd 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 9abea8cdd..b2c2b8a37 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.1-SNAPSHOT + 1.6.1 caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 6ee5a94cf..7dc7f9e40 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.1-SNAPSHOT + 1.6.1 caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index a30e0c0c0..fca2da967 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 6b2ff0e1c..a24172f5b 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index 2fe661bd1..727d99cc5 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index 1f79a1f98..7455c555a 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index 9d1bd0ec1..31d3071a1 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index 6f0958c5e..faca29ed0 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.1-SNAPSHOT + 1.6.1 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 7e631ae67..cc0a8f939 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 caf-web diff --git a/pom.xml b/pom.xml index eda29bb2c..ea9ae3e2f 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.1-SNAPSHOT + 1.6.1 pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - HEAD + v1.6.1 @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-commons - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-commons-cryptography - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-commons-exception - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-commons-exception-diagnostic - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-commons-qrcode - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-commons-runtime - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-commons-serialization - 1.6.1-SNAPSHOT + 1.6.1 @@ -733,265 +733,265 @@ io.iec.edp caf-business-context-core - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-business-context-dist - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-business-context-memory - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-context-api - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-data-jdbc - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-data-jpa - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-event - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-i18n - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-i18n-api - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-i18n-runtime - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-lock-api - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-lock-memory - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-lock-redis - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-lock-extension-jpa - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-logging - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-msu-api - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-msu-client - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-msu-common - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-msu-server - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-multicontext - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-multicontext-support - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rest - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rest-api - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rest-client - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rest-server - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rpc - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rpc-api - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rpc-client - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rpc-registry-api - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rpc-registry-core - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rpc-registry-db - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rpc-remote-http - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rpc-server - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-rpc-remote-grpc - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-session - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-session-api - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-session-backend - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-session-core - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-session-web - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-tenancy - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-tenancy-api - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-tenancy-core - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-tenancy-repository-jpa - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-web - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-middleware - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-middleware-baolande - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-middleware-infrastructure - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-middleware-tomcat - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-middleware-tongweb - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-provider - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp @@ -1001,39 +1001,39 @@ io.iec.edp caf-session-provider - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-i18n-provider - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-security - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-security-api - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-model - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-model-api - 1.6.1-SNAPSHOT + 1.6.1 io.iec.edp caf-model-core - 1.6.1-SNAPSHOT + 1.6.1 -- Gitee From 768488c004bf8fd2a23bbdd26ca6ceee10c7b88d Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Tue, 11 Jun 2024 06:30:40 +0000 Subject: [PATCH 02/54] [maven-release-plugin] prepare for next development iteration --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 4 +- caf-data/caf-data-multilang/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 134 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index aeefc2bbd..e8b2d6e2a 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 60ec585f1..3b0023e90 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index ce85630a4..be617c7ed 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index d15bb9fcb..ca6fefe54 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index 775966ba7..d5f179ddf 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index 6da745b0e..c9e2c44d2 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index 82280bc2a..ccfec79b3 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 5203ed961..0c694d923 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index 00a5d7f75..e7c0e1f93 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index 4d1f832a6..a8cdaa195 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 12a670759..13a77e88f 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 8e2f37db0..c51ca2f36 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 157cdf7fd..43cb94350 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index dfe3cf2ec..30d77419d 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 6a37223be..2e8e38649 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 @@ -118,7 +118,7 @@ io.iec.edp caf-data-multilang - 1.6.1 + 1.6.3-SNAPSHOT compile diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index 90cf8c343..fc4596e7c 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.1 + 1.6.3-SNAPSHOT caf-data-multilang diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 092615667..edb80ec24 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index d8608b826..adb668a1e 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index b4094ad9b..1f54b7bb0 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 0cde1257f..83f5c5ba3 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 640751753..986aec229 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index dd9d1fe29..f2abd208d 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 524912e72..844eb5f11 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.1 + 1.6.3-SNAPSHOT caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index a973402b9..9969ed416 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 34c8c5419..80124f947 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index e6fc2c960..d1e6ac41b 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index c0af979f0..ad6475865 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 704a53012..59ebca44e 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.1 + 1.6.3-SNAPSHOT caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index 04090493a..dbef3d2e6 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.1 + 1.6.3-SNAPSHOT caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index af3a765f6..3065a68db 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 58676801e..38482a30f 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index cddc1dd1e..de1b2ab69 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index c5306b5c5..233d4b55a 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 44c5e6ab7..15a833d5f 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index f7a0e477a..e6c0e3c5a 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index a94d3aac1..80fa54b0f 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index bf13e8f06..2020cb1c4 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index da6b187cd..1bbf6460b 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 89114711a..0cb6ece40 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.1 + 1.6.3-SNAPSHOT caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index e2f81500f..aee68ba2c 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index 3153ddaa2..c05a064a1 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index e1f5ff2af..72da3b750 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index 27ae98cef..fc4c00c4f 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index bd80876ad..196a9f061 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 4cf99ac05..750e28f88 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index 83bb88cbe..a749d6ffe 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 7495c50c0..85aef6039 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index f1aa752cd..b5924fb4e 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index e3953dfd9..44c9926d3 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index b5e629df4..e13a5a506 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index a1f5e3dba..1435f992c 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index f1c014273..8cc504224 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 24c65a19c..343def915 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index d0b4a3875..f4f1abec6 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index 16a5337db..a5c6ccffa 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index beb3ae300..6e7e713ee 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index 1ca29b490..ef79ae04e 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index 7618d0a83..f0b932108 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index 2b59b88f2..b0537c9d7 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 2d2458581..5bc9c1154 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index 0ef36aabf..a5e39e6f3 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 28b806b5e..1e3a84e43 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index ca64ee3bd..063e54ebb 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index b2c2b8a37..2f9ad1336 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.1 + 1.6.3-SNAPSHOT caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 7dc7f9e40..65cf2c27c 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.1 + 1.6.3-SNAPSHOT caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index fca2da967..e74c623f9 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index a24172f5b..2427b9707 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index 727d99cc5..b9b8750e6 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index 7455c555a..0c093a0a5 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index 31d3071a1..e69e8305f 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index faca29ed0..25d113e6f 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index cc0a8f939..7d222704f 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT caf-web diff --git a/pom.xml b/pom.xml index ea9ae3e2f..40036e595 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.1 + 1.6.3-SNAPSHOT pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - v1.6.1 + HEAD @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-cryptography - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-exception - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-exception-diagnostic - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-qrcode - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-runtime - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-serialization - 1.6.1 + 1.6.3-SNAPSHOT @@ -733,265 +733,265 @@ io.iec.edp caf-business-context-core - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-business-context-dist - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-business-context-memory - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-context-api - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-data-jdbc - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-data-jpa - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-event - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-api - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-runtime - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-api - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-memory - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-redis - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-extension-jpa - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-logging - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-api - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-client - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-common - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-server - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-multicontext - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-multicontext-support - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rest - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-api - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-client - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-server - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-api - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-client - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-api - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-core - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-db - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-remote-http - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-server - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-remote-grpc - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-session - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-session-api - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-session-backend - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-session-core - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-session-web - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-api - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-core - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-repository-jpa - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-web - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-baolande - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-infrastructure - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-tomcat - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-tongweb - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-provider - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp @@ -1001,39 +1001,39 @@ io.iec.edp caf-session-provider - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-provider - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-security - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-security-api - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-model - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-model-api - 1.6.1 + 1.6.3-SNAPSHOT io.iec.edp caf-model-core - 1.6.1 + 1.6.3-SNAPSHOT -- Gitee From 03d7e6ad99b3bae332c5154055988b613f57cfb7 Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Fri, 21 Jun 2024 15:23:38 +0800 Subject: [PATCH 03/54] =?UTF-8?q?=E8=B0=83=E6=95=B4rpc=E5=AE=9E=E4=BD=93pa?= =?UTF-8?q?ram=E5=92=8Creturnvalue=E4=B8=8E=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=88=97=E8=BD=AC=E6=8D=A2=E6=96=B9=E6=B3=95=E4=B8=BAjackson;?= =?UTF-8?q?=E8=B0=83=E6=95=B4rpc=20defination=E5=BA=8F=E5=88=97=E5=8C=96?= =?UTF-8?q?=E4=B8=BAjackson?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/iec/edp/caf/rpc/api/schema/TypeSchema.java | 3 +++ .../rpc/api/serialize/RpcDefinitionSerializer.java | 12 +++--------- .../domain/convert/RpcDefinitionConverter.java | 10 ++++------ .../domain/convert/RpcReturnValueConverter.java | 8 +++----- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/schema/TypeSchema.java b/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/schema/TypeSchema.java index 944c0b2fa..232cb045c 100644 --- a/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/schema/TypeSchema.java +++ b/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/schema/TypeSchema.java @@ -33,6 +33,9 @@ public class TypeSchema implements Serializable { private String className; private TypeEnum typeEnum; + public TypeSchema(){ + } + public TypeSchema(TypeEnum type) { this.typeEnum = type; } diff --git a/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/serialize/RpcDefinitionSerializer.java b/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/serialize/RpcDefinitionSerializer.java index 35d903949..9433c6ef4 100644 --- a/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/serialize/RpcDefinitionSerializer.java +++ b/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/serialize/RpcDefinitionSerializer.java @@ -16,10 +16,7 @@ package io.iec.edp.caf.rpc.api.serialize; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.parser.Feature; -import com.alibaba.fastjson.parser.ParserConfig; -import com.alibaba.fastjson.serializer.SerializerFeature; +import io.iec.edp.caf.common.JSONSerializer; /** * 自定义序列化器 用于序列化Definition @@ -29,17 +26,14 @@ import com.alibaba.fastjson.serializer.SerializerFeature; * @author guowenchang */ public class RpcDefinitionSerializer implements RpcCustomSerializer { - static { - ParserConfig.getGlobalInstance().addAccept("io.iec.edp.caf.rpc.api"); - } @Override public String serialize(Object obj) { - return JSON.toJSONString(obj, SerializerFeature.WriteClassName); + return JSONSerializer.serialize(obj); } @Override public T deserialize(String s, Class clazz) { - return JSON.parseObject(s, clazz, Feature.OrderedField); + return JSONSerializer.deserialize(s, clazz); } } diff --git a/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/convert/RpcDefinitionConverter.java b/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/convert/RpcDefinitionConverter.java index a3101a0d0..abaa92df1 100644 --- a/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/convert/RpcDefinitionConverter.java +++ b/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/convert/RpcDefinitionConverter.java @@ -16,24 +16,22 @@ package io.iec.edp.caf.rpc.registry.storage.database.domain.convert; -import io.iec.edp.caf.rpc.api.serialize.RpcCustomSerializer; -import io.iec.edp.caf.rpc.api.serialize.RpcDefinitionSerializer; +import io.iec.edp.caf.common.JSONSerializer; +import io.iec.edp.caf.rpc.api.entity.RpcParamDefinition; import javax.persistence.AttributeConverter; import java.util.ArrayList; import java.util.List; public class RpcDefinitionConverter implements AttributeConverter { - private static RpcCustomSerializer rpcCustomSerializer = new RpcDefinitionSerializer(); - public RpcDefinitionConverter() { } public String convertToDatabaseColumn(List attribute) { - return attribute == null ? "" : rpcCustomSerializer.serialize(attribute); + return attribute == null ? "" : JSONSerializer.serialize(attribute); } public List convertToEntityAttribute(String dbData) { - return dbData != null && dbData.length() != 0 ? rpcCustomSerializer.deserialize(dbData, List.class) : new ArrayList(); + return dbData != null && dbData.length() != 0 ? JSONSerializer.deserialize(dbData, List.class, RpcParamDefinition.class) : new ArrayList(); } } diff --git a/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/convert/RpcReturnValueConverter.java b/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/convert/RpcReturnValueConverter.java index 891d7580a..83112796b 100644 --- a/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/convert/RpcReturnValueConverter.java +++ b/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/convert/RpcReturnValueConverter.java @@ -16,23 +16,21 @@ package io.iec.edp.caf.rpc.registry.storage.database.domain.convert; +import io.iec.edp.caf.common.JSONSerializer; import io.iec.edp.caf.rpc.api.entity.RpcReturnValueDefinition; -import io.iec.edp.caf.rpc.api.serialize.RpcCustomSerializer; -import io.iec.edp.caf.rpc.api.serialize.RpcDefinitionSerializer; import javax.persistence.AttributeConverter; public class RpcReturnValueConverter implements AttributeConverter { - private static RpcCustomSerializer rpcCustomSerializer = new RpcDefinitionSerializer(); public RpcReturnValueConverter() { } public String convertToDatabaseColumn(RpcReturnValueDefinition attribute) { - return attribute == null ? "" : rpcCustomSerializer.serialize(attribute); + return attribute == null ? "" : JSONSerializer.serialize(attribute); } public RpcReturnValueDefinition convertToEntityAttribute(String dbData) { - return dbData != null && dbData.length() != 0 ? rpcCustomSerializer.deserialize(dbData, RpcReturnValueDefinition.class) : null; + return dbData != null && dbData.length() != 0 ? JSONSerializer.deserialize(dbData, RpcReturnValueDefinition.class) : null; } } -- Gitee From 97b6ab49516c2b83c8f273993d5dbe2b4abd3bd6 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Tue, 25 Jun 2024 02:25:41 +0000 Subject: [PATCH 04/54] [maven-release-plugin] prepare release v1.6.2-rc.1 --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 4 +- caf-data/caf-data-multilang/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 134 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index e8b2d6e2a..f6320cf4e 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 3b0023e90..0214dc6ee 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index be617c7ed..1d19a2f48 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index ca6fefe54..4ac22a53a 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index d5f179ddf..9d759ea6b 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index c9e2c44d2..06010df59 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index ccfec79b3..bce5786d1 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 0c694d923..d08fbe736 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index e7c0e1f93..4a05dc860 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index a8cdaa195..1f4d98ab3 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 13a77e88f..72238a7b0 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index c51ca2f36..171d9afc9 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 43cb94350..bfd4d5f82 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 30d77419d..c43d5125a 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 2e8e38649..14e4d11c6 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 @@ -118,7 +118,7 @@ io.iec.edp caf-data-multilang - 1.6.3-SNAPSHOT + 1.6.2-rc.1 compile diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index fc4596e7c..9d1deb4b8 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-data-multilang diff --git a/caf-data/pom.xml b/caf-data/pom.xml index edb80ec24..236a86489 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index adb668a1e..f6ba06565 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 1f54b7bb0..6a73c26b2 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 83f5c5ba3..c57bb1f8a 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 986aec229..fd0a4fa33 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index f2abd208d..1520caff9 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 844eb5f11..e75b1200e 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 9969ed416..9aa6ff254 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 80124f947..2091ee1da 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index d1e6ac41b..e237ba27d 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index ad6475865..5b54f1985 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 59ebca44e..c37f32d62 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index dbef3d2e6..ec59d6261 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 3065a68db..a3dc529d4 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 38482a30f..73feac14d 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index de1b2ab69..ade35360f 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 233d4b55a..0a64e4c8f 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 15a833d5f..9b3426ca0 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index e6c0e3c5a..74cbc8966 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 80fa54b0f..b9c8c424a 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 2020cb1c4..f28aae40c 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 1bbf6460b..6ec85f398 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 0cb6ece40..5bbd6f068 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index aee68ba2c..3bb2833a9 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index c05a064a1..a7864c383 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 72da3b750..bfabe0604 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index fc4c00c4f..1009cd014 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 196a9f061..579180292 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 750e28f88..08e3de983 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index a749d6ffe..0dfbc345e 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 85aef6039..74295e119 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index b5924fb4e..1986611aa 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index 44c9926d3..8ab4f7ae3 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index e13a5a506..f0e28f173 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 1435f992c..d86a85849 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 8cc504224..ffbc8bcc4 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 343def915..28ea48ef9 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index f4f1abec6..7fc31be13 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index a5c6ccffa..a309f50a7 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 6e7e713ee..1513411c2 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index ef79ae04e..cff48c0d8 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index f0b932108..e8abc15e2 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index b0537c9d7..777f7efa4 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 5bc9c1154..232626225 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index a5e39e6f3..59a13a4e6 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 1e3a84e43..0965165ad 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 063e54ebb..e549196cf 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 2f9ad1336..9b3d90dc4 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 65cf2c27c..927bc83cc 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index e74c623f9..ccec8294e 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 2427b9707..4778d7a25 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index b9b8750e6..9630ef51d 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index 0c093a0a5..aedc1706b 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index e69e8305f..dd71fcda3 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index 25d113e6f..50f0c10ef 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.2-rc.1 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 7d222704f..ec479900a 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 caf-web diff --git a/pom.xml b/pom.xml index 40036e595..6d55258b3 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.2-rc.1 pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - HEAD + v1.6.2-rc.1 @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-commons - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-commons-cryptography - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-commons-exception - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-commons-exception-diagnostic - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-commons-qrcode - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-commons-runtime - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-commons-serialization - 1.6.3-SNAPSHOT + 1.6.2-rc.1 @@ -733,265 +733,265 @@ io.iec.edp caf-business-context-core - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-business-context-dist - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-business-context-memory - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-context-api - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-data-jdbc - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-data-jpa - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-event - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-i18n-api - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-i18n-runtime - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-lock-api - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-lock-memory - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-lock-redis - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-lock-extension-jpa - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-logging - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-msu-api - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-msu-client - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-msu-common - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-msu-server - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-multicontext - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-multicontext-support - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rest - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rest-api - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rest-client - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rest-server - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rpc - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rpc-api - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rpc-client - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rpc-registry-api - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rpc-registry-core - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rpc-registry-db - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rpc-remote-http - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rpc-server - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-rpc-remote-grpc - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-session - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-session-api - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-session-backend - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-session-core - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-session-web - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-tenancy-api - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-tenancy-core - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-tenancy-repository-jpa - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-web - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-middleware - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-middleware-baolande - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-middleware-infrastructure - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-middleware-tomcat - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-middleware-tongweb - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-provider - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp @@ -1001,39 +1001,39 @@ io.iec.edp caf-session-provider - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-i18n-provider - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-security - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-security-api - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-model-api - 1.6.3-SNAPSHOT + 1.6.2-rc.1 io.iec.edp caf-model-core - 1.6.3-SNAPSHOT + 1.6.2-rc.1 -- Gitee From 9caa2e290fba8b5a99945801f6ab4ad6ae251097 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Tue, 25 Jun 2024 02:25:41 +0000 Subject: [PATCH 05/54] [maven-release-plugin] prepare for next development iteration --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 4 +- caf-data/caf-data-multilang/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 134 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index f6320cf4e..b4e04d6c9 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 0214dc6ee..96eea173e 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index 1d19a2f48..fc05f372d 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index 4ac22a53a..cc618ebb5 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index 9d759ea6b..0c8405238 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index 06010df59..a5321f8e1 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index bce5786d1..14e5c688a 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index d08fbe736..5ec5af205 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index 4a05dc860..9674524a8 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index 1f4d98ab3..cf2eaee7e 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 72238a7b0..0fd1128c1 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 171d9afc9..7d53f8742 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index bfd4d5f82..7bc5c6976 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index c43d5125a..0d9a3946e 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 14e4d11c6..7b7da0b11 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 @@ -118,7 +118,7 @@ io.iec.edp caf-data-multilang - 1.6.2-rc.1 + 1.6.2-SNAPSHOT compile diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index 9d1deb4b8..d0719906d 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-data-multilang diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 236a86489..3efa33185 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index f6ba06565..759dc9471 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 6a73c26b2..d805f01d5 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index c57bb1f8a..81409370d 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index fd0a4fa33..8162728e9 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index 1520caff9..b930a8ad5 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index e75b1200e..159d708a8 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 9aa6ff254..dfc284b6d 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 2091ee1da..b17b04c52 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index e237ba27d..83ed26a05 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index 5b54f1985..a362fe893 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index c37f32d62..92e85768c 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index ec59d6261..fcc8d53af 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index a3dc529d4..c4734259a 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 73feac14d..012d82668 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index ade35360f..23abd9178 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 0a64e4c8f..4cbe5ef9e 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 9b3426ca0..bed833a20 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index 74cbc8966..b23a8d5a1 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index b9c8c424a..89dc422a3 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index f28aae40c..56996db7f 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 6ec85f398..e403990df 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 5bbd6f068..4c6e029cb 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index 3bb2833a9..c64246269 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index a7864c383..e497c6cab 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index bfabe0604..0f455da1f 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index 1009cd014..ff36f57aa 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 579180292..2d67921ee 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 08e3de983..432ebe160 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index 0dfbc345e..884b63d15 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 74295e119..a8e6aec51 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index 1986611aa..4da5442c4 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index 8ab4f7ae3..8bf2d49f8 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index f0e28f173..26198da34 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index d86a85849..a47d11843 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index ffbc8bcc4..4087945ca 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 28ea48ef9..14577b62d 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index 7fc31be13..c2d3dce83 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index a309f50a7..cba7df910 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 1513411c2..025953aeb 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index cff48c0d8..07bbe3ce0 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index e8abc15e2..8f289a4b8 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index 777f7efa4..8082d9b49 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 232626225..241afa32f 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index 59a13a4e6..d81e7a2ba 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 0965165ad..2f1d276c9 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index e549196cf..a71c03f14 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 9b3d90dc4..90bfc2d95 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 927bc83cc..ea6091d03 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index ccec8294e..2c6f912ec 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 4778d7a25..fcc5f8385 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index 9630ef51d..50f1292b8 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index aedc1706b..f8fecf32a 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index dd71fcda3..bcdf474c5 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index 50f0c10ef..c5524ae9c 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-rc.1 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index ec479900a..5288ae53a 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT caf-web diff --git a/pom.xml b/pom.xml index 6d55258b3..041ed44f1 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.2-rc.1 + 1.6.2-SNAPSHOT pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - v1.6.2-rc.1 + HEAD @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-commons - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-commons-cryptography - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-commons-exception - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-commons-exception-diagnostic - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-commons-qrcode - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-commons-runtime - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-commons-serialization - 1.6.2-rc.1 + 1.6.2-SNAPSHOT @@ -733,265 +733,265 @@ io.iec.edp caf-business-context-core - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-business-context-dist - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-business-context-memory - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-context-api - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-data-jdbc - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-data-jpa - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-event - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-i18n - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-i18n-api - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-i18n-runtime - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-lock-api - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-lock-memory - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-lock-redis - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-lock-extension-jpa - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-logging - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-msu-api - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-msu-client - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-msu-common - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-msu-server - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-multicontext - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-multicontext-support - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rest - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rest-api - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rest-client - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rest-server - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-api - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-client - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-registry-api - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-registry-core - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-registry-db - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-remote-http - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-server - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-remote-grpc - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-session - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-session-api - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-session-backend - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-session-core - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-session-web - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-tenancy - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-tenancy-api - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-tenancy-core - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-tenancy-repository-jpa - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-web - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-middleware - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-middleware-baolande - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-middleware-infrastructure - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-middleware-tomcat - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-middleware-tongweb - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-provider - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp @@ -1001,39 +1001,39 @@ io.iec.edp caf-session-provider - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-i18n-provider - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-security - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-security-api - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-model - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-model-api - 1.6.2-rc.1 + 1.6.2-SNAPSHOT io.iec.edp caf-model-core - 1.6.2-rc.1 + 1.6.2-SNAPSHOT -- Gitee From c57a256d4909c2553963f433ec3775478cbc4d6a Mon Sep 17 00:00:00 2001 From: Ren xuebing Date: Tue, 25 Jun 2024 10:35:34 +0800 Subject: [PATCH 06/54] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 691f68e96..ab9601469 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ include: variables: # Java - JAVA_DOCKER_IMAGE: hub.docker.iec.io/library/openjdk:8-buster + JAVA_DOCKER_IMAGE: registry.inspures.com/public/docker.io/library/openjdk:8-buster # Maven ALLOW_PUBLISHING_TO_MAVEN_REPO: "true" -- Gitee From 8032358951c5b9e149f5e73fcd4aa32809177377 Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Wed, 26 Jun 2024 14:15:58 +0800 Subject: [PATCH 07/54] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E7=83=AD?= =?UTF-8?q?=E6=8A=A5=E9=94=99;=E5=9B=BD=E9=99=85=E5=8C=96=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E5=AE=9E=E4=BD=93=E6=B7=BB=E5=8A=A0toString(),getI18n?= =?UTF-8?q?Values()=E6=96=B9=E6=B3=95;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApplicationClassLoaderManager.java | 14 ++- caf-data/caf-data-multilang/pom.xml | 4 + .../support/CafJpaLanguageThreadHolder.java | 0 .../multilang/CAFMultiLanguageColumn.java | 85 ++++++++++++++++--- .../resolver/AppManagerResolver.java | 18 +++- 5 files changed, 97 insertions(+), 24 deletions(-) rename caf-data/{caf-data-jpa => caf-data-multilang}/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaLanguageThreadHolder.java (100%) diff --git a/caf-commons/caf-commons-runtime/src/main/java/io/iec/edp/caf/commons/ApplicationClassLoaderManager.java b/caf-commons/caf-commons-runtime/src/main/java/io/iec/edp/caf/commons/ApplicationClassLoaderManager.java index e89e800ef..5782aab19 100644 --- a/caf-commons/caf-commons-runtime/src/main/java/io/iec/edp/caf/commons/ApplicationClassLoaderManager.java +++ b/caf-commons/caf-commons-runtime/src/main/java/io/iec/edp/caf/commons/ApplicationClassLoaderManager.java @@ -16,11 +16,9 @@ package io.iec.edp.caf.commons; -import io.iec.edp.caf.app.manager.classloader.CAFClassLoader; import io.iec.edp.caf.commons.runtime.CafEnvironment; import io.iec.edp.caf.commons.runtime.env.enums.StartupMode; import io.iec.edp.caf.commons.spi.AppManagerResolver; -import io.iec.edp.caf.commons.utils.ClassLoaderUtils; import io.iec.edp.caf.msu.common.manager.AppManager; import lombok.var; import org.slf4j.Logger; @@ -94,20 +92,20 @@ public class ApplicationClassLoaderManager { * @return */ public static ClassLoader getCafClassLoader(StartupMode mode) { - ClassLoader cl = AppManager.getCafClassLoader(); - if(mode==null){ + ClassLoader cl = null; + if (mode == null) { mode = StartupMode.Serial; } - switch (mode){ + switch (mode) { case Parallel: cl = getServiceClassLoader(); + break; case Serial: - cl = AppManager.getCafClassLoader(); default: cl = AppManager.getCafClassLoader(); } - if(logger.isDebugEnabled()){ - logger.debug("getCafClassLoader current classloader type ["+cl.getClass().getName()+"]"); + if (logger.isDebugEnabled()) { + logger.debug("getCafClassLoader current classloader type [" + cl.getClass().getName() + "]"); } return cl; } diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index fc4596e7c..57c562daf 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -39,6 +39,10 @@ org.projectlombok lombok + + org.hibernate + hibernate-core + diff --git a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaLanguageThreadHolder.java b/caf-data/caf-data-multilang/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaLanguageThreadHolder.java similarity index 100% rename from caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaLanguageThreadHolder.java rename to caf-data/caf-data-multilang/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaLanguageThreadHolder.java diff --git a/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java b/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java index 6cb264e8c..b45c0bb54 100644 --- a/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java +++ b/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java @@ -15,12 +15,17 @@ */ package io.iec.edp.caf.data.multilang; + +import io.iec.caf.data.jpa.repository.support.CafJpaLanguageThreadHolder; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.hibernate.persister.entity.PersistersContext; import javax.persistence.Embeddable; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 多语嵌入类型映射列 @@ -35,7 +40,7 @@ public class CAFMultiLanguageColumn { /** * 语言属性列名集合 */ - public static final List MlcColumn = new ArrayList(){{ + public static final List MlcColumn = new ArrayList() {{ add("cafMlcchs"); add("cafMlcen"); add("cafMlccht"); @@ -46,33 +51,89 @@ public class CAFMultiLanguageColumn { public static final String fieldPrefix = "cafMlc"; /** - *语言属性的命名规则：cafMlc+语言后缀 + * 语言属性的命名规则：cafMlc+语言后缀 */ private String cafMlcchs; private String cafMlcen; private String cafMlccht; private String cafMlcpt; private String cafMlces; - public CAFMultiLanguageColumn(){ + public CAFMultiLanguageColumn() { } - public String getValue(String currentLanguage){ - if(log.isDebugEnabled()){ - log.debug("current language is:"+currentLanguage); + /** + * 根据语言获取多语值 + * + * @param currentLanguage 语言 + */ + public String getValue(String currentLanguage) { + if (log.isDebugEnabled()) { + log.debug("current language is:" + currentLanguage); } - if(currentLanguage.equalsIgnoreCase("zh-CHS")){ + if (currentLanguage.equalsIgnoreCase("zh-CHS")) { return cafMlcchs; - }else if(currentLanguage.equalsIgnoreCase("en")){ + } else if (currentLanguage.equalsIgnoreCase("en")) { return cafMlcen; - }else if(currentLanguage.equalsIgnoreCase("zh-CHT")){ + } else if (currentLanguage.equalsIgnoreCase("zh-CHT")) { return cafMlccht; - }else if(currentLanguage.equalsIgnoreCase("pt")){ + } else if (currentLanguage.equalsIgnoreCase("pt")) { return cafMlcpt; - }else if(currentLanguage.equalsIgnoreCase("es")){ + } else if (currentLanguage.equalsIgnoreCase("es")) { return cafMlces; - }else{ + } else { + return cafMlcchs; + } + } + + /** + * 返回多语Map<语言编号,对应值> + */ + @SuppressWarnings("JpaAttributeMemberSignatureInspection") + public Map getI18nValues() { + Map i18nValues = new HashMap<>(); + //TODO getI18nValues()使用CafJpaLanguageThreadHolder 和 toString()使用PersistersContext, 没有统一的工具类获取上下文语言及系统启动语言，后续有统一工具时，建议调整 + Map langs = CafJpaLanguageThreadHolder.getLanguages(); + if (cafMlcchs != null && langs.containsValue("CHS")) i18nValues.put(getLangCode(langs, "CHS"), cafMlcchs); + if (cafMlcen != null && langs.containsValue("EN")) i18nValues.put(getLangCode(langs, "EN"), cafMlcen); + if (cafMlccht != null && langs.containsValue("CHT")) i18nValues.put(getLangCode(langs, "CHT"), cafMlccht); + + //TODO PT和ES的判断 + return i18nValues; + } + + private String getLangCode(Map langs, String value) { + for (Map.Entry entry : langs.entrySet()) { + if (entry.getValue().equalsIgnoreCase(value)) { + return entry.getKey(); + } + } + return null; + } + + /** + * 根据当前语言打印信息 + */ + public String toString() { + String languageSuffix = PersistersContext.getCurrentLangSuffix(); + + if (log.isDebugEnabled()) { + log.debug("current language suffix is {}", languageSuffix); + } + + if ("_CHS".equalsIgnoreCase(languageSuffix)) { return cafMlcchs; + } else if ("_EN".equalsIgnoreCase(languageSuffix)) { + return cafMlcen; + } else if ("_CHT".equalsIgnoreCase(languageSuffix)) { + return cafMlccht; + } else if ("_PT".equalsIgnoreCase(languageSuffix)) { + return cafMlcpt; + } else if ("_ES".equalsIgnoreCase(languageSuffix)) { + return cafMlces; + } else { + //TODO 上下文语言为空或者没有匹配时，返回null还是默认简体中？ + return null; } } } diff --git a/caf-multicontext/src/main/java/io/iec/edp/caf/multicontext/resolver/AppManagerResolver.java b/caf-multicontext/src/main/java/io/iec/edp/caf/multicontext/resolver/AppManagerResolver.java index a2eb995b1..3b505484b 100644 --- a/caf-multicontext/src/main/java/io/iec/edp/caf/multicontext/resolver/AppManagerResolver.java +++ b/caf-multicontext/src/main/java/io/iec/edp/caf/multicontext/resolver/AppManagerResolver.java @@ -16,10 +16,7 @@ package io.iec.edp.caf.multicontext.resolver; -import io.iec.edp.caf.commons.ApplicationClassLoaderManager; -import io.iec.edp.caf.commons.runtime.env.enums.StartupMode; import io.iec.edp.caf.commons.utils.SpringBeanUtils; -import io.iec.edp.caf.msu.common.manager.AppManager; import io.iec.edp.caf.multicontext.classloader.PlatformClassloader; import io.iec.edp.caf.multicontext.context.PlatformApplicationContext; import io.iec.edp.caf.multicontext.support.ModuleManager; @@ -54,10 +51,23 @@ public class AppManagerResolver implements io.iec.edp.caf.commons.spi.AppManager @Override public URLClassPath getSuClasspath(String msu) { - var classloader = ApplicationClassLoaderManager.getCafClassLoader(StartupMode.Parallel); + var classloader = getPlatformClassloader(); if(log.isDebugEnabled()){ log.debug("current classloader type ["+classloader.getClass().getName()+"]"); } return ((PlatformClassloader) classloader).getSuClasspath(msu); } + + private static ClassLoader getPlatformClassloader() { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + //迭代寻找需要的classloader + while (cl != null) { + //如果识别为并行启动 + if (cl instanceof PlatformClassloader) { + return cl; + } + cl = cl.getParent(); + } + return Thread.currentThread().getContextClassLoader(); + } } -- Gitee From 8f4bd605e7073e17686515a8ff8ecc59c41ecd7d Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Wed, 26 Jun 2024 09:04:04 +0000 Subject: [PATCH 08/54] [maven-release-plugin] prepare release v1.6.2-rc.2 --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 4 +- caf-data/caf-data-multilang/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 134 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index b4e04d6c9..b3e9ff7c8 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 96eea173e..8ea098408 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index fc05f372d..1b1ed7d90 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index cc618ebb5..82c10fadc 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index 0c8405238..3abe7a242 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index a5321f8e1..3663c4c79 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index 14e5c688a..096000fc8 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 5ec5af205..9703e1f5e 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index 9674524a8..b32b2ecc4 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index cf2eaee7e..358f752c3 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 0fd1128c1..59ab75f13 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 7d53f8742..10e03eeac 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 7bc5c6976..fcf04aa7c 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 0d9a3946e..acf6c2f54 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 7b7da0b11..0711e166f 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 @@ -118,7 +118,7 @@ io.iec.edp caf-data-multilang - 1.6.2-SNAPSHOT + 1.6.2-rc.2 compile diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index ccd1e2bcf..532eba0a6 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-data-multilang diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 3efa33185..13e2e313b 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index 759dc9471..ee46a4ae6 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index d805f01d5..2bb6efa58 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 81409370d..90d96a1d2 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 8162728e9..0c2b915a4 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index b930a8ad5..48fa3fa45 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 159d708a8..17f51f583 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index dfc284b6d..fcf4fa3da 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index b17b04c52..b6577c35d 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index 83ed26a05..29d71c013 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index a362fe893..914cca05e 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 92e85768c..15efe07aa 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index fcc8d53af..ed7f07cd0 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index c4734259a..dd3fdcd05 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 012d82668..8047fa8d7 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index 23abd9178..8889d2dc8 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 4cbe5ef9e..00393d9ac 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index bed833a20..3692730b7 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index b23a8d5a1..36c2c1d74 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 89dc422a3..6b3a4ec5e 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 56996db7f..eea786eab 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index e403990df..65c245776 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 4c6e029cb..a555db90a 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index c64246269..4c81d9240 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index e497c6cab..db8f35cf5 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 0f455da1f..2837394da 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index ff36f57aa..c028a5777 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 2d67921ee..61e173dec 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 432ebe160..387af5fa7 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index 884b63d15..87a17e109 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index a8e6aec51..00e572823 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index 4da5442c4..5ad0ec453 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index 8bf2d49f8..d1f9ceeb2 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index 26198da34..173920c8d 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index a47d11843..1635f716a 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 4087945ca..4aec05960 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 14577b62d..7b008357d 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index c2d3dce83..67b4fadec 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index cba7df910..7bd831d22 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 025953aeb..d6a8f9bc1 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index 07bbe3ce0..2f4b9195e 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index 8f289a4b8..2f2a855c2 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index 8082d9b49..536d6668b 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 241afa32f..ecd39709f 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index d81e7a2ba..26ec39578 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 2f1d276c9..ecf920735 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index a71c03f14..7d710450d 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 90bfc2d95..1ba1d897a 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index ea6091d03..1951bedf6 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index 2c6f912ec..13a581381 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index fcc5f8385..5c35c0d2f 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index 50f1292b8..c84fe08ff 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index f8fecf32a..e87de7e0d 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index bcdf474c5..d90ddcf24 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index c5524ae9c..79d788c5e 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2-rc.2 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 5288ae53a..8e69e0e0b 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 caf-web diff --git a/pom.xml b/pom.xml index 041ed44f1..49ef809b1 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2-rc.2 pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - HEAD + v1.6.2-rc.2 @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-commons - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-commons-cryptography - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-commons-exception - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-commons-exception-diagnostic - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-commons-qrcode - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-commons-runtime - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-commons-serialization - 1.6.2-SNAPSHOT + 1.6.2-rc.2 @@ -733,265 +733,265 @@ io.iec.edp caf-business-context-core - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-business-context-dist - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-business-context-memory - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-context-api - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-data-jdbc - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-data-jpa - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-event - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-i18n - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-i18n-api - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-i18n-runtime - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-lock-api - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-lock-memory - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-lock-redis - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-lock-extension-jpa - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-logging - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-msu-api - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-msu-client - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-msu-common - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-msu-server - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-multicontext - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-multicontext-support - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rest - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rest-api - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rest-client - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rest-server - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rpc - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rpc-api - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rpc-client - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rpc-registry-api - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rpc-registry-core - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rpc-registry-db - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rpc-remote-http - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rpc-server - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-rpc-remote-grpc - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-session - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-session-api - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-session-backend - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-session-core - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-session-web - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-tenancy - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-tenancy-api - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-tenancy-core - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-tenancy-repository-jpa - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-web - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-middleware - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-middleware-baolande - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-middleware-infrastructure - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-middleware-tomcat - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-middleware-tongweb - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-provider - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp @@ -1001,39 +1001,39 @@ io.iec.edp caf-session-provider - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-i18n-provider - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-security - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-security-api - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-model - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-model-api - 1.6.2-SNAPSHOT + 1.6.2-rc.2 io.iec.edp caf-model-core - 1.6.2-SNAPSHOT + 1.6.2-rc.2 -- Gitee From 289bb9c980796a62abdd5ca92bce79f11661c575 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Wed, 26 Jun 2024 09:04:04 +0000 Subject: [PATCH 09/54] [maven-release-plugin] prepare for next development iteration --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 4 +- caf-data/caf-data-multilang/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 134 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index b3e9ff7c8..b4e04d6c9 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 8ea098408..96eea173e 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index 1b1ed7d90..fc05f372d 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index 82c10fadc..cc618ebb5 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index 3abe7a242..0c8405238 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index 3663c4c79..a5321f8e1 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index 096000fc8..14e5c688a 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 9703e1f5e..5ec5af205 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index b32b2ecc4..9674524a8 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index 358f752c3..cf2eaee7e 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 59ab75f13..0fd1128c1 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 10e03eeac..7d53f8742 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index fcf04aa7c..7bc5c6976 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index acf6c2f54..0d9a3946e 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 0711e166f..7b7da0b11 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 @@ -118,7 +118,7 @@ io.iec.edp caf-data-multilang - 1.6.2-rc.2 + 1.6.2-SNAPSHOT compile diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index 532eba0a6..ccd1e2bcf 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-data-multilang diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 13e2e313b..3efa33185 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index ee46a4ae6..759dc9471 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 2bb6efa58..d805f01d5 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 90d96a1d2..81409370d 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 0c2b915a4..8162728e9 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index 48fa3fa45..b930a8ad5 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 17f51f583..159d708a8 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index fcf4fa3da..dfc284b6d 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index b6577c35d..b17b04c52 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index 29d71c013..83ed26a05 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index 914cca05e..a362fe893 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 15efe07aa..92e85768c 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index ed7f07cd0..fcc8d53af 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index dd3fdcd05..c4734259a 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 8047fa8d7..012d82668 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index 8889d2dc8..23abd9178 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 00393d9ac..4cbe5ef9e 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 3692730b7..bed833a20 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index 36c2c1d74..b23a8d5a1 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 6b3a4ec5e..89dc422a3 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index eea786eab..56996db7f 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 65c245776..e403990df 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index a555db90a..4c6e029cb 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index 4c81d9240..c64246269 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index db8f35cf5..e497c6cab 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 2837394da..0f455da1f 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index c028a5777..ff36f57aa 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 61e173dec..2d67921ee 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 387af5fa7..432ebe160 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index 87a17e109..884b63d15 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 00e572823..a8e6aec51 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index 5ad0ec453..4da5442c4 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index d1f9ceeb2..8bf2d49f8 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index 173920c8d..26198da34 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 1635f716a..a47d11843 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 4aec05960..4087945ca 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 7b008357d..14577b62d 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index 67b4fadec..c2d3dce83 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index 7bd831d22..cba7df910 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index d6a8f9bc1..025953aeb 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index 2f4b9195e..07bbe3ce0 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index 2f2a855c2..8f289a4b8 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index 536d6668b..8082d9b49 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index ecd39709f..241afa32f 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index 26ec39578..d81e7a2ba 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index ecf920735..2f1d276c9 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 7d710450d..a71c03f14 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 1ba1d897a..90bfc2d95 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 1951bedf6..ea6091d03 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index 13a581381..2c6f912ec 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 5c35c0d2f..fcc5f8385 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index c84fe08ff..50f1292b8 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index e87de7e0d..f8fecf32a 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index d90ddcf24..bcdf474c5 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index 79d788c5e..c5524ae9c 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-rc.2 + 1.6.2-SNAPSHOT 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 8e69e0e0b..5288ae53a 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT caf-web diff --git a/pom.xml b/pom.xml index 49ef809b1..041ed44f1 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.2-rc.2 + 1.6.2-SNAPSHOT pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - v1.6.2-rc.2 + HEAD @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-commons - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-commons-cryptography - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-commons-exception - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-commons-exception-diagnostic - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-commons-qrcode - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-commons-runtime - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-commons-serialization - 1.6.2-rc.2 + 1.6.2-SNAPSHOT @@ -733,265 +733,265 @@ io.iec.edp caf-business-context-core - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-business-context-dist - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-business-context-memory - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-context-api - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-data-jdbc - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-data-jpa - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-event - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-i18n - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-i18n-api - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-i18n-runtime - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-lock-api - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-lock-memory - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-lock-redis - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-lock-extension-jpa - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-logging - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-msu-api - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-msu-client - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-msu-common - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-msu-server - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-multicontext - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-multicontext-support - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rest - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rest-api - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rest-client - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rest-server - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-api - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-client - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-registry-api - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-registry-core - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-registry-db - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-remote-http - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-server - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-rpc-remote-grpc - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-session - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-session-api - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-session-backend - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-session-core - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-session-web - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-tenancy - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-tenancy-api - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-tenancy-core - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-tenancy-repository-jpa - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-web - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-middleware - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-middleware-baolande - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-middleware-infrastructure - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-middleware-tomcat - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-middleware-tongweb - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-provider - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp @@ -1001,39 +1001,39 @@ io.iec.edp caf-session-provider - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-i18n-provider - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-security - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-security-api - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-model - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-model-api - 1.6.2-rc.2 + 1.6.2-SNAPSHOT io.iec.edp caf-model-core - 1.6.2-rc.2 + 1.6.2-SNAPSHOT -- Gitee From 66c25495ace8bf38b16b6bca2bff1d14a38ef9e0 Mon Sep 17 00:00:00 2001 From: ljbonbon <1481281891@qq.com> Date: Thu, 27 Jun 2024 17:11:39 +0800 Subject: [PATCH 10/54] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multilang/CAFMultiLanguageColumn.java | 31 ++++++++++ .../tenancy/api/entity/EmbeddedTenant.java | 58 +++++++++++++++++++ .../edp/caf/tenancy/api/entity/Tenant.java | 23 ++++---- .../core/repository/TenantRepository.java | 5 +- .../tenancy/core/service/TenantManager.java | 39 +++++++++++-- 5 files changed, 137 insertions(+), 19 deletions(-) create mode 100644 caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java diff --git a/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java b/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java index b45c0bb54..021cc4a3f 100644 --- a/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java +++ b/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java @@ -86,6 +86,37 @@ public class CAFMultiLanguageColumn { } } + public void setValue(Map value){ + String languageSuffix = PersistersContext.getCurrentLangSuffix(); + + if (log.isDebugEnabled()) { + log.debug("current language suffix is {}", languageSuffix); + } + if(value.containsKey("_CHS")){ + if ("_CHS".equalsIgnoreCase(languageSuffix)) { + this.setCafMlcchs(value.get("current")); + this.setCafMlcen(value.get("_EN")); + this.setCafMlccht(value.get("_CHT")); + } else if ("_EN".equalsIgnoreCase(languageSuffix)) { + this.setCafMlcen(value.get("current")); + this.setCafMlcchs(value.get("_CHS")); + this.setCafMlccht(value.get("_CHT")); + } else if ("_CHT".equalsIgnoreCase(languageSuffix)) { + this.setCafMlccht(value.get("current")); + this.setCafMlcen(value.get("_EN")); + this.setCafMlcchs(value.get("_CHS")); + } + }else{ + if ("_CHS".equalsIgnoreCase(languageSuffix)) { + this.setCafMlcchs(value.get("current")); + } else if ("_EN".equalsIgnoreCase(languageSuffix)) { + this.setCafMlcen(value.get("current")); + } else if ("_CHT".equalsIgnoreCase(languageSuffix)) { + this.setCafMlccht(value.get("current")); + } + } + } + /** * 返回多语Map<语言编号,对应值> */ diff --git a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java new file mode 100644 index 000000000..515d2da49 --- /dev/null +++ b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java @@ -0,0 +1,58 @@ +package io.iec.edp.caf.tenancy.api.entity; + +import io.iec.caf.data.jpa.repository.CafI18nStringColumn; +import io.iec.edp.caf.data.multilang.CAFMultiLanguageColumn; +import lombok.Data; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; +@Entity +@Data +@Table(name="ecptenant") +public class EmbeddedTenant implements Serializable { + /** + * 租户唯一标识 + */ + @Id + @Column + private int id; + + /** + * 租户编号 + */ + @Column + private String code; + + @Override + public String toString() { + return "Tenant{" + + "id=" + id + + ", code='" + code + '\'' + + ", name='" + name + '\'' + + ", createdTime=" + createdTime + + '}'; + } + + /** + * 租户名称 + */ + @Column + @Embedded + private CAFMultiLanguageColumn name; + + /** + * 最后更新时间 + */ + @Column + private Date createdTime; + + public EmbeddedTenant(){} + + public EmbeddedTenant(Tenant tenant){ + this.id=tenant.getId(); + this.code=tenant.getCode(); + this.name=new CAFMultiLanguageColumn(); + this.createdTime=tenant.getCreatedTime(); + } +} diff --git a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java index ca48b662c..9595fce6c 100644 --- a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java +++ b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java @@ -32,22 +32,15 @@ import java.util.Date; * @author Hey Law * @create 2019/8/19 17:18 */ -@Entity @Data -@Table(name="ecptenant") public class Tenant implements Serializable { - /** - * 租户唯一标识 - */ - @Id - @Column private int id; /** * 租户编号 */ - @Column + private String code; @Override @@ -63,14 +56,22 @@ public class Tenant implements Serializable { /** * 租户名称 */ - @Column - @CafI18nStringColumn + private String name; /** * 最后更新时间 */ - @Column + private Date createdTime; + public Tenant(){} + + public Tenant(EmbeddedTenant embeddedTenant){ + this.id=embeddedTenant.getId(); + this.code=embeddedTenant.getCode(); + this.name=embeddedTenant.getName().toString(); + this.createdTime=embeddedTenant.getCreatedTime(); + } + } diff --git a/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/repository/TenantRepository.java b/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/repository/TenantRepository.java index 8c7885f10..2b2a7980f 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/repository/TenantRepository.java +++ b/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/repository/TenantRepository.java @@ -17,6 +17,7 @@ package io.iec.edp.caf.tenancy.core.repository; import io.iec.caf.data.jpa.repository.CafJpaRepository; +import io.iec.edp.caf.tenancy.api.entity.EmbeddedTenant; import io.iec.edp.caf.tenancy.api.entity.Tenant; import org.springframework.data.jpa.repository.JpaRepository; @@ -26,9 +27,9 @@ import org.springframework.data.jpa.repository.JpaRepository; * @author Hey Law * @create 2019年8月22日09:49:49$ */ -public interface TenantRepository extends CafJpaRepository { +public interface TenantRepository extends CafJpaRepository { - Tenant findByCode(String code); + EmbeddedTenant findByCode(String code); void deleteById(Integer id); } diff --git a/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java b/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java index 72eb6f6a8..64c0c3b35 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java +++ b/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java @@ -16,12 +16,14 @@ package io.iec.edp.caf.tenancy.core.service; +import io.iec.caf.data.jpa.repository.CafI18nColumnDict; import io.iec.edp.caf.commons.exception.ExceptionLevel; import io.iec.edp.caf.commons.transaction.JpaTransaction; import io.iec.edp.caf.commons.transaction.TransactionPropagation; import io.iec.edp.caf.commons.utils.SpringBeanUtils; import io.iec.edp.caf.i18n.api.LanguageSuffixProvider; import io.iec.edp.caf.tenancy.api.entity.AppInstanceInfo; +import io.iec.edp.caf.tenancy.api.entity.EmbeddedTenant; import io.iec.edp.caf.tenancy.api.entity.Tenant; import io.iec.edp.caf.tenancy.api.exception.TenantException; import io.iec.edp.caf.tenancy.api.service.TenantAppInstanceService; @@ -90,7 +92,7 @@ public class TenantManager implements TenantPersistenceService { // String suffix = this.langRepository.findByCode(language).getFieldSuffix(); var tmp = this.repository.findById(tenantId); if (tmp.isPresent()) { - tenant = tmp.get(); + tenant = new Tenant(tmp.get()); } this.addCache(tenantId, language, tenant); } @@ -106,11 +108,11 @@ public class TenantManager implements TenantPersistenceService { public void saveTenant(Tenant tenant){ //清一把缓存(没法更新缓存，因为allTenantsCache存的value是个List) allTenantsCache.clear(); - this.repository.save(tenant); + saveEmbeddedTenant(tenant); } public void deleteTenantById(Integer tenantId){ - Optional result=this.repository.findById(tenantId); + Optional result=this.repository.findById(tenantId); if(result.isPresent()){ this.repository.deleteById(tenantId); } @@ -129,7 +131,13 @@ public class TenantManager implements TenantPersistenceService { else{ // String suffix = this.langRepository.findByCode(language).getFieldSuffix(); this.setLanguageFieldSuffix(language); - List allTenants = this.repository.findAll(); + List allEmbeddedTenants = this.repository.findAll(); + List allTenants=new ArrayList<>(); + if(allEmbeddedTenants!=null&&allEmbeddedTenants.size()>0){ + for(EmbeddedTenant embeddedTenant:allEmbeddedTenants){ + allTenants.add(new Tenant(embeddedTenant)); + } + } allTenantsCache.put(language,allTenants); return allTenants; } @@ -144,7 +152,12 @@ public class TenantManager implements TenantPersistenceService { DataValidator.checkForEmptyString(tenantCode, "tenantCode"); this.setLanguageFieldSuffix(language); - return this.repository.findByCode(tenantCode); + EmbeddedTenant embeddedTenant=this.repository.findByCode(tenantCode); + Tenant tenant=null; + if(embeddedTenant!=null){ + tenant=new Tenant(embeddedTenant); + } + return tenant; } /** @@ -163,7 +176,7 @@ public class TenantManager implements TenantPersistenceService { { // String suffix = this.langRepository.findByCode(language).getFieldSuffix(); this.setLanguageFieldSuffix(language); - this.repository.save(tenant); + saveEmbeddedTenant(tenant); this.addCache(tenant.getId(), language, tenant); } } @@ -208,6 +221,20 @@ public class TenantManager implements TenantPersistenceService { } } + private void saveEmbeddedTenant(Tenant tenant){ + Optional result=this.repository.findById(tenant.getId()); + Map valueMap=new HashMap<>(); + valueMap.put("current",tenant.getName()); + if(result.isPresent()){ + EmbeddedTenant selectTenant=result.get(); + valueMap.put("_CHS",selectTenant.getName().getCafMlcchs()); + valueMap.put("_EN",selectTenant.getName().getCafMlcen()); + valueMap.put("_CHT",selectTenant.getName().getCafMlccht()); + } + EmbeddedTenant embeddedTenant=new EmbeddedTenant(tenant); + embeddedTenant.getName().setValue(valueMap); + this.repository.save(embeddedTenant); + } /** * 根据租户标识获取缓存key * -- Gitee From 3df896712e0c9038117e962725fe045c5f3b2e46 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Tue, 2 Jul 2024 01:18:13 +0000 Subject: [PATCH 11/54] [maven-release-plugin] prepare release v1.6.2 --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 4 +- caf-data/caf-data-multilang/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 134 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index b4e04d6c9..490bfeb63 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 96eea173e..4204656c4 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index fc05f372d..9367c1f95 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index cc618ebb5..adaed5f02 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index 0c8405238..adbf494c3 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index a5321f8e1..46eba9ecf 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index 14e5c688a..e360187e8 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 5ec5af205..3bf8de1a0 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index 9674524a8..2b7e61bfb 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index cf2eaee7e..d2f6366f3 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 0fd1128c1..dddd5d562 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 7d53f8742..c83c33487 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 7bc5c6976..778276077 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 0d9a3946e..8facfa5fc 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 7b7da0b11..1317ddc26 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 @@ -118,7 +118,7 @@ io.iec.edp caf-data-multilang - 1.6.2-SNAPSHOT + 1.6.2 compile diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index ccd1e2bcf..730323541 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.2-SNAPSHOT + 1.6.2 caf-data-multilang diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 3efa33185..0733b4758 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index 759dc9471..6165a4c6a 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index d805f01d5..4593747a5 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 81409370d..31f51f0ca 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 8162728e9..7c907d900 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index b930a8ad5..68f437b19 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 159d708a8..a15142390 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.2-SNAPSHOT + 1.6.2 caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index dfc284b6d..575540519 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index b17b04c52..05e06a439 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index 83ed26a05..33f143a9a 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index a362fe893..4e29e59a1 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 92e85768c..27131f49f 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.2-SNAPSHOT + 1.6.2 caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index fcc8d53af..6b7d6be28 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.2-SNAPSHOT + 1.6.2 caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index c4734259a..3168fc2fb 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 012d82668..324def41d 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index 23abd9178..cb050b2d5 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 4cbe5ef9e..3a0b4faea 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index bed833a20..b15902abe 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index b23a8d5a1..ae4ee6bde 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 89dc422a3..0edcbc4e8 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 56996db7f..f0727183a 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index e403990df..c872cfd3b 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 4c6e029cb..819bbd9ac 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.2-SNAPSHOT + 1.6.2 caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index c64246269..eed3f3b26 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index e497c6cab..65cc1714e 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 0f455da1f..10e46cf6e 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index ff36f57aa..a8d4809b1 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 2d67921ee..9e2e3971b 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 432ebe160..96d80d7de 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index 884b63d15..ac1cb1486 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index a8e6aec51..6a75b4c53 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index 4da5442c4..fffdb6354 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index 8bf2d49f8..cb270fffb 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index 26198da34..bfc32fd19 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index a47d11843..fed848017 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 4087945ca..f0137dd4e 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 14577b62d..03e1fa710 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index c2d3dce83..bdbc1237e 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index cba7df910..89b305520 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 025953aeb..3462dc122 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index 07bbe3ce0..58972eed2 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index 8f289a4b8..b11e26947 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index 8082d9b49..04656e2aa 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 241afa32f..fdd9d7bfd 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index d81e7a2ba..8206f6916 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 2f1d276c9..dc0f2f549 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index a71c03f14..221e05b20 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 90bfc2d95..b00047813 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.2-SNAPSHOT + 1.6.2 caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index ea6091d03..851eaa5e8 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.2-SNAPSHOT + 1.6.2 caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index 2c6f912ec..91a3f568e 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index fcc5f8385..ad144c363 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index 50f1292b8..802674de6 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index f8fecf32a..c64beedb4 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index bcdf474c5..19556a6a6 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index c5524ae9c..6c0963a7f 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2-SNAPSHOT + 1.6.2 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 5288ae53a..7054db26a 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 caf-web diff --git a/pom.xml b/pom.xml index 041ed44f1..520757f93 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.2-SNAPSHOT + 1.6.2 pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - HEAD + v1.6.2 @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-commons - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-commons-cryptography - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-commons-exception - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-commons-exception-diagnostic - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-commons-qrcode - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-commons-runtime - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-commons-serialization - 1.6.2-SNAPSHOT + 1.6.2 @@ -733,265 +733,265 @@ io.iec.edp caf-business-context-core - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-business-context-dist - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-business-context-memory - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-context-api - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-data-jdbc - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-data-jpa - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-event - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-i18n - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-i18n-api - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-i18n-runtime - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-lock-api - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-lock-memory - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-lock-redis - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-lock-extension-jpa - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-logging - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-msu-api - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-msu-client - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-msu-common - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-msu-server - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-multicontext - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-multicontext-support - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rest - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rest-api - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rest-client - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rest-server - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rpc - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rpc-api - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rpc-client - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rpc-registry-api - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rpc-registry-core - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rpc-registry-db - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rpc-remote-http - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rpc-server - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-rpc-remote-grpc - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-session - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-session-api - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-session-backend - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-session-core - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-session-web - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-tenancy - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-tenancy-api - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-tenancy-core - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-tenancy-repository-jpa - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-web - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-middleware - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-middleware-baolande - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-middleware-infrastructure - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-middleware-tomcat - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-middleware-tongweb - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-provider - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp @@ -1001,39 +1001,39 @@ io.iec.edp caf-session-provider - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-i18n-provider - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-security - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-security-api - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-model - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-model-api - 1.6.2-SNAPSHOT + 1.6.2 io.iec.edp caf-model-core - 1.6.2-SNAPSHOT + 1.6.2 -- Gitee From 9dc023639cd5f73aa2135cb8c8e50e9e2d1e1dd4 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Tue, 2 Jul 2024 01:18:13 +0000 Subject: [PATCH 12/54] [maven-release-plugin] prepare for next development iteration --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 4 +- caf-data/caf-data-multilang/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 134 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index 490bfeb63..e8b2d6e2a 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 4204656c4..3b0023e90 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index 9367c1f95..be617c7ed 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index adaed5f02..ca6fefe54 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index adbf494c3..d5f179ddf 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index 46eba9ecf..c9e2c44d2 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index e360187e8..ccfec79b3 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 3bf8de1a0..0c694d923 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index 2b7e61bfb..e7c0e1f93 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index d2f6366f3..a8cdaa195 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index dddd5d562..13a77e88f 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index c83c33487..c51ca2f36 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 778276077..43cb94350 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 8facfa5fc..30d77419d 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 1317ddc26..2e8e38649 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 @@ -118,7 +118,7 @@ io.iec.edp caf-data-multilang - 1.6.2 + 1.6.3-SNAPSHOT compile diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index 730323541..57c562daf 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.2 + 1.6.3-SNAPSHOT caf-data-multilang diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 0733b4758..edb80ec24 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index 6165a4c6a..adb668a1e 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 4593747a5..1f54b7bb0 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 31f51f0ca..83f5c5ba3 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 7c907d900..986aec229 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index 68f437b19..f2abd208d 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index a15142390..844eb5f11 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.2 + 1.6.3-SNAPSHOT caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 575540519..9969ed416 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 05e06a439..80124f947 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index 33f143a9a..d1e6ac41b 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index 4e29e59a1..ad6475865 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 27131f49f..59ebca44e 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.2 + 1.6.3-SNAPSHOT caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index 6b7d6be28..dbef3d2e6 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.2 + 1.6.3-SNAPSHOT caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 3168fc2fb..3065a68db 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 324def41d..38482a30f 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index cb050b2d5..de1b2ab69 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 3a0b4faea..233d4b55a 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index b15902abe..15a833d5f 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index ae4ee6bde..e6c0e3c5a 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 0edcbc4e8..80fa54b0f 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index f0727183a..2020cb1c4 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index c872cfd3b..1bbf6460b 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 819bbd9ac..0cb6ece40 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.2 + 1.6.3-SNAPSHOT caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index eed3f3b26..aee68ba2c 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index 65cc1714e..c05a064a1 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 10e46cf6e..72da3b750 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index a8d4809b1..fc4c00c4f 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 9e2e3971b..196a9f061 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 96d80d7de..750e28f88 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index ac1cb1486..a749d6ffe 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 6a75b4c53..85aef6039 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index fffdb6354..b5924fb4e 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index cb270fffb..44c9926d3 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index bfc32fd19..e13a5a506 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index fed848017..1435f992c 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index f0137dd4e..8cc504224 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 03e1fa710..343def915 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index bdbc1237e..f4f1abec6 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index 89b305520..a5c6ccffa 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 3462dc122..6e7e713ee 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index 58972eed2..ef79ae04e 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index b11e26947..f0b932108 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index 04656e2aa..b0537c9d7 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index fdd9d7bfd..5bc9c1154 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index 8206f6916..a5e39e6f3 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index dc0f2f549..1e3a84e43 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 221e05b20..063e54ebb 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index b00047813..2f9ad1336 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.2 + 1.6.3-SNAPSHOT caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 851eaa5e8..65cf2c27c 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.2 + 1.6.3-SNAPSHOT caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index 91a3f568e..e74c623f9 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index ad144c363..2427b9707 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index 802674de6..b9b8750e6 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index c64beedb4..0c093a0a5 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index 19556a6a6..e69e8305f 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index 6c0963a7f..25d113e6f 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 7054db26a..7d222704f 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT caf-web diff --git a/pom.xml b/pom.xml index 520757f93..40036e595 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.2 + 1.6.3-SNAPSHOT pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - v1.6.2 + HEAD @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-cryptography - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-exception - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-exception-diagnostic - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-qrcode - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-runtime - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-serialization - 1.6.2 + 1.6.3-SNAPSHOT @@ -733,265 +733,265 @@ io.iec.edp caf-business-context-core - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-business-context-dist - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-business-context-memory - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-context-api - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-data-jdbc - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-data-jpa - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-event - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-api - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-runtime - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-api - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-memory - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-redis - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-extension-jpa - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-logging - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-api - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-client - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-common - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-server - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-multicontext - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-multicontext-support - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rest - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-api - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-client - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-server - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-api - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-client - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-api - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-core - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-db - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-remote-http - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-server - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-remote-grpc - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-session - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-session-api - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-session-backend - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-session-core - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-session-web - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-api - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-core - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-repository-jpa - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-web - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-baolande - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-infrastructure - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-tomcat - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-tongweb - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-provider - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp @@ -1001,39 +1001,39 @@ io.iec.edp caf-session-provider - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-provider - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-security - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-security-api - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-model - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-model-api - 1.6.2 + 1.6.3-SNAPSHOT io.iec.edp caf-model-core - 1.6.2 + 1.6.3-SNAPSHOT -- Gitee From 89749faa46b7e4a852ef62177217fb8741212755 Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Wed, 3 Jul 2024 13:59:33 +0800 Subject: [PATCH 13/54] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E6=96=B0=E5=A2=9EsetValue=E3=80=81setI18nValues=E6=96=B9?= =?UTF-8?q?=E6=B3=95;=E4=BF=AE=E6=94=B9=E7=A7=9F=E6=88=B7=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multilang/CAFMultiLanguageColumn.java | 135 ++++++++++-------- .../tenancy/core/service/TenantManager.java | 18 +-- 2 files changed, 84 insertions(+), 69 deletions(-) diff --git a/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java b/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java index 021cc4a3f..83ce548f0 100644 --- a/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java +++ b/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java @@ -65,102 +65,121 @@ public class CAFMultiLanguageColumn { /** * 根据语言获取多语值 * - * @param currentLanguage 语言 + * @param langCode 语言编号 */ - public String getValue(String currentLanguage) { - if (log.isDebugEnabled()) { - log.debug("current language is:" + currentLanguage); - } - if (currentLanguage.equalsIgnoreCase("zh-CHS")) { + public String getValue(String langCode) { + if (log.isDebugEnabled()) log.debug("current language is {}", langCode); + + Map langs = CafJpaLanguageThreadHolder.getLanguages(); + String suffix = langs.get(langCode); + if ("CHS".equalsIgnoreCase(suffix)) { return cafMlcchs; - } else if (currentLanguage.equalsIgnoreCase("en")) { + } else if ("EN".equalsIgnoreCase(suffix)) { return cafMlcen; - } else if (currentLanguage.equalsIgnoreCase("zh-CHT")) { + } else if ("CHT".equalsIgnoreCase(suffix)) { return cafMlccht; - } else if (currentLanguage.equalsIgnoreCase("pt")) { + } else if ("PT".equalsIgnoreCase(suffix)) { return cafMlcpt; - } else if (currentLanguage.equalsIgnoreCase("es")) { + } else if ("ES".equalsIgnoreCase(suffix)) { return cafMlces; } else { return cafMlcchs; } } - public void setValue(Map value){ - String languageSuffix = PersistersContext.getCurrentLangSuffix(); - - if (log.isDebugEnabled()) { - log.debug("current language suffix is {}", languageSuffix); + /** + * 设置当前语言多语值 + * + * @param value 多语值 + */ + public void setValue(String value) { + String suffix = PersistersContext.getCurrentLangSuffix(); + + if (log.isDebugEnabled()) log.debug("current language suffix is {}", suffix); + + suffix = suffix.replaceAll("^_", ""); + if ("CHS".equalsIgnoreCase(suffix)) { + this.cafMlcchs = value; + } else if ("EN".equalsIgnoreCase(suffix)) { + this.cafMlcen = value; + } else if ("CHT".equalsIgnoreCase(suffix)) { + this.cafMlccht = value; + } else if ("PT".equalsIgnoreCase(suffix)) { + this.cafMlcpt = value; + } else if ("ES".equalsIgnoreCase(suffix)) { + this.cafMlces = value; } - if(value.containsKey("_CHS")){ - if ("_CHS".equalsIgnoreCase(languageSuffix)) { - this.setCafMlcchs(value.get("current")); - this.setCafMlcen(value.get("_EN")); - this.setCafMlccht(value.get("_CHT")); - } else if ("_EN".equalsIgnoreCase(languageSuffix)) { - this.setCafMlcen(value.get("current")); - this.setCafMlcchs(value.get("_CHS")); - this.setCafMlccht(value.get("_CHT")); - } else if ("_CHT".equalsIgnoreCase(languageSuffix)) { - this.setCafMlccht(value.get("current")); - this.setCafMlcen(value.get("_EN")); - this.setCafMlcchs(value.get("_CHS")); - } - }else{ - if ("_CHS".equalsIgnoreCase(languageSuffix)) { - this.setCafMlcchs(value.get("current")); - } else if ("_EN".equalsIgnoreCase(languageSuffix)) { - this.setCafMlcen(value.get("current")); - } else if ("_CHT".equalsIgnoreCase(languageSuffix)) { - this.setCafMlccht(value.get("current")); - } + } + + /** + * 设置多语值 + * + * @param i18nValues 多语Map <语言编号,对应值> + */ + public void setI18nValues(Map i18nValues) { + if (i18nValues != null) { + Map langs = CafJpaLanguageThreadHolder.getLanguages(); + i18nValues.forEach((langCode, value) -> { + String suffix = langs.get(langCode); + if (suffix != null) { + if ("CHS".equalsIgnoreCase(suffix)) { + this.cafMlcchs = value; + } else if ("EN".equalsIgnoreCase(suffix)) { + this.cafMlcen = value; + } else if ("CHT".equalsIgnoreCase(suffix)) { + this.cafMlccht = value; + } else if ("PT".equalsIgnoreCase(suffix)) { + this.cafMlcpt = value; + } else if ("ES".equalsIgnoreCase(suffix)) { + this.cafMlces = value; + } + } + }); } } /** - * 返回多语Map<语言编号,对应值> + * 返回多语Map <语言编号,对应值> */ @SuppressWarnings("JpaAttributeMemberSignatureInspection") public Map getI18nValues() { Map i18nValues = new HashMap<>(); //TODO getI18nValues()使用CafJpaLanguageThreadHolder 和 toString()使用PersistersContext, 没有统一的工具类获取上下文语言及系统启动语言，后续有统一工具时，建议调整 Map langs = CafJpaLanguageThreadHolder.getLanguages(); - if (cafMlcchs != null && langs.containsValue("CHS")) i18nValues.put(getLangCode(langs, "CHS"), cafMlcchs); - if (cafMlcen != null && langs.containsValue("EN")) i18nValues.put(getLangCode(langs, "EN"), cafMlcen); - if (cafMlccht != null && langs.containsValue("CHT")) i18nValues.put(getLangCode(langs, "CHT"), cafMlccht); + Map maps = reverseMap(langs); + if (cafMlcchs != null && langs.containsValue("CHS")) i18nValues.put(maps.get("CHS"), cafMlcchs); + if (cafMlcen != null && langs.containsValue("EN")) i18nValues.put(maps.get("EN"), cafMlcen); + if (cafMlccht != null && langs.containsValue("CHT")) i18nValues.put(maps.get("CHT"), cafMlccht); + if (cafMlcpt != null && langs.containsValue("PT")) i18nValues.put(maps.get("PT"), cafMlcpt); + if (cafMlces != null && langs.containsValue("ES")) i18nValues.put(maps.get("ES"), cafMlces); - //TODO PT和ES的判断 return i18nValues; } - private String getLangCode(Map langs, String value) { - for (Map.Entry entry : langs.entrySet()) { - if (entry.getValue().equalsIgnoreCase(value)) { - return entry.getKey(); - } - } - return null; + private Map reverseMap(Map langs) { + Map map = new HashMap<>(); + langs.forEach((code, suffix) -> map.put(suffix, code)); + return map; } /** * 根据当前语言打印信息 */ public String toString() { - String languageSuffix = PersistersContext.getCurrentLangSuffix(); + String suffix = PersistersContext.getCurrentLangSuffix(); - if (log.isDebugEnabled()) { - log.debug("current language suffix is {}", languageSuffix); - } + if (log.isDebugEnabled()) log.debug("current language suffix is {}", suffix); - if ("_CHS".equalsIgnoreCase(languageSuffix)) { + suffix = suffix.replaceAll("^_", ""); + if ("CHS".equalsIgnoreCase(suffix)) { return cafMlcchs; - } else if ("_EN".equalsIgnoreCase(languageSuffix)) { + } else if ("EN".equalsIgnoreCase(suffix)) { return cafMlcen; - } else if ("_CHT".equalsIgnoreCase(languageSuffix)) { + } else if ("CHT".equalsIgnoreCase(suffix)) { return cafMlccht; - } else if ("_PT".equalsIgnoreCase(languageSuffix)) { + } else if ("PT".equalsIgnoreCase(suffix)) { return cafMlcpt; - } else if ("_ES".equalsIgnoreCase(languageSuffix)) { + } else if ("ES".equalsIgnoreCase(suffix)) { return cafMlces; } else { //TODO 上下文语言为空或者没有匹配时，返回null还是默认简体中？ diff --git a/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java b/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java index 64c0c3b35..40e2e0992 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java +++ b/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java @@ -221,18 +221,14 @@ public class TenantManager implements TenantPersistenceService { } } - private void saveEmbeddedTenant(Tenant tenant){ - Optional result=this.repository.findById(tenant.getId()); - Map valueMap=new HashMap<>(); - valueMap.put("current",tenant.getName()); - if(result.isPresent()){ - EmbeddedTenant selectTenant=result.get(); - valueMap.put("_CHS",selectTenant.getName().getCafMlcchs()); - valueMap.put("_EN",selectTenant.getName().getCafMlcen()); - valueMap.put("_CHT",selectTenant.getName().getCafMlccht()); + private void saveEmbeddedTenant(Tenant tenant) { + Optional result = this.repository.findById(tenant.getId()); + EmbeddedTenant embeddedTenant = new EmbeddedTenant(tenant); + if (result.isPresent()) { + EmbeddedTenant selectTenant = result.get(); + selectTenant.getName().setValue(tenant.getName()); + embeddedTenant.setName(selectTenant.getName()); } - EmbeddedTenant embeddedTenant=new EmbeddedTenant(tenant); - embeddedTenant.getName().setValue(valueMap); this.repository.save(embeddedTenant); } /** -- Gitee From 54d094aaaa49c5159cb5c8855adadfe65c74b54f Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Wed, 3 Jul 2024 16:21:14 +0800 Subject: [PATCH 14/54] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edp/caf/data/multilang/MulitLangColumnTest.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/caf-data/caf-data-multilang/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java b/caf-data/caf-data-multilang/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java index 0f632b7f3..c34d7cf3c 100644 --- a/caf-data/caf-data-multilang/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java +++ b/caf-data/caf-data-multilang/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java @@ -16,14 +16,23 @@ package io.iec.edp.caf.data.multilang; +import io.iec.caf.data.jpa.repository.support.CafJpaLanguageThreadHolder; import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; + +import java.util.HashMap; +import java.util.Map; public class MulitLangColumnTest { @Test - public void testMultiLangColumn(){ + public void testMultiLangColumn() { + Map langs = new HashMap<>(); + langs.put("zh-CHS", "CHS"); + langs.put("en", "EN"); + langs.put("zh-CHT", "CHT"); + CafJpaLanguageThreadHolder.setLanguages(langs); + CAFMultiLanguageColumn column = new CAFMultiLanguageColumn(); column.setCafMlcen("hello"); column.setCafMlccht("你好"); -- Gitee From 2e48194e8246edb39f7a05f10930250bf104e12e Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Wed, 3 Jul 2024 17:57:49 +0800 Subject: [PATCH 15/54] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multilangcolumn/CAFMultiLangEmbededTest.java | 14 ++++++++++---- .../caf/data/multilang/MulitLangColumnTest.java | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/caf-data/caf-data-jpa/src/test/java/io/iec/edp/caf/data/multilangcolumn/CAFMultiLangEmbededTest.java b/caf-data/caf-data-jpa/src/test/java/io/iec/edp/caf/data/multilangcolumn/CAFMultiLangEmbededTest.java index 8f4d052f0..7311866c1 100644 --- a/caf-data/caf-data-jpa/src/test/java/io/iec/edp/caf/data/multilangcolumn/CAFMultiLangEmbededTest.java +++ b/caf-data/caf-data-jpa/src/test/java/io/iec/edp/caf/data/multilangcolumn/CAFMultiLangEmbededTest.java @@ -17,8 +17,10 @@ package io.iec.edp.caf.data.multilangcolumn; +import io.iec.caf.data.jpa.repository.support.CafJpaLanguageThreadHolder; import io.iec.edp.caf.commons.utils.SpringBeanUtils; import io.iec.edp.caf.data.multilang.CAFMultiLanguageColumn; +import org.hibernate.persister.entity.PersistersContext; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -34,10 +36,7 @@ import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.UUID; +import java.util.*; @RunWith(SpringRunner.class) @@ -57,6 +56,13 @@ public class CAFMultiLangEmbededTest { @Before public void init(){ + Map langs = new HashMap<>(); + langs.put("zh-CHS", "CHS"); + langs.put("en", "EN"); + langs.put("zh-CHT", "CHT"); + CafJpaLanguageThreadHolder.setLanguages(langs); + PersistersContext.setCurrentLangSuffix("_CHS"); + MockitoAnnotations.openMocks(this); SpringBeanUtils.setApplicationContext(applicationContext); } diff --git a/caf-data/caf-data-multilang/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java b/caf-data/caf-data-multilang/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java index c34d7cf3c..2415e9252 100644 --- a/caf-data/caf-data-multilang/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java +++ b/caf-data/caf-data-multilang/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java @@ -17,6 +17,7 @@ package io.iec.edp.caf.data.multilang; import io.iec.caf.data.jpa.repository.support.CafJpaLanguageThreadHolder; +import org.hibernate.persister.entity.PersistersContext; import org.junit.Assert; import org.junit.Test; @@ -32,6 +33,7 @@ public class MulitLangColumnTest { langs.put("en", "EN"); langs.put("zh-CHT", "CHT"); CafJpaLanguageThreadHolder.setLanguages(langs); + PersistersContext.setCurrentLangSuffix("_CHS"); CAFMultiLanguageColumn column = new CAFMultiLanguageColumn(); column.setCafMlcen("hello"); -- Gitee From f6333b373c7a39aa9df3c7384fb3426c154ca563 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Fri, 5 Jul 2024 05:45:56 +0000 Subject: [PATCH 16/54] [maven-release-plugin] prepare release v1.6.3-rc.1 --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 4 +- caf-data/caf-data-multilang/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 134 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index e8b2d6e2a..b19516654 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 3b0023e90..07996a7d1 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index be617c7ed..868a6e7d5 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index ca6fefe54..1853acb93 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index d5f179ddf..7d48f73fe 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index c9e2c44d2..6b745a496 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index ccfec79b3..95c9061cf 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 0c694d923..ac0685013 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index e7c0e1f93..57a108322 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index a8cdaa195..b7b19ad52 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 13a77e88f..d35bb818d 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index c51ca2f36..338d65b74 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 43cb94350..f410166c4 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 30d77419d..1b70d191a 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 2e8e38649..d92ac7f1e 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 @@ -118,7 +118,7 @@ io.iec.edp caf-data-multilang - 1.6.3-SNAPSHOT + 1.6.3-rc.1 compile diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index 57c562daf..b4bda366f 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-data-multilang diff --git a/caf-data/pom.xml b/caf-data/pom.xml index edb80ec24..23d472415 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index adb668a1e..fd93e5f74 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 1f54b7bb0..9b91bb15f 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 83f5c5ba3..a8e95678b 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 986aec229..1b5b34992 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index f2abd208d..befe692b0 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 844eb5f11..c4f390ac8 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 9969ed416..b02ac3020 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 80124f947..445d1ca34 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index d1e6ac41b..348e6b392 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index ad6475865..3f104f52e 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 59ebca44e..2d96ef250 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index dbef3d2e6..90f22e81a 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 3065a68db..66fac5836 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 38482a30f..6e6a60fac 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index de1b2ab69..02a4c7ab2 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 233d4b55a..84b473b0f 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 15a833d5f..d46b9233b 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index e6c0e3c5a..75195070b 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 80fa54b0f..d0c01a675 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 2020cb1c4..882077051 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 1bbf6460b..c3fb6e632 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 0cb6ece40..c234131fd 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index aee68ba2c..aca7d985c 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index c05a064a1..fea301f62 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 72da3b750..4e6da5e73 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index fc4c00c4f..b91733a5a 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 196a9f061..54e89de80 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 750e28f88..db4952577 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index a749d6ffe..4bf939a86 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 85aef6039..0ad1493b9 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index b5924fb4e..b3c5297ba 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index 44c9926d3..da41c46a9 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index e13a5a506..bcd3522af 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 1435f992c..78361e2bf 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 8cc504224..b27d3656c 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 343def915..f95026b61 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index f4f1abec6..6326acfad 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index a5c6ccffa..616f8e214 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 6e7e713ee..c3ef91487 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index ef79ae04e..be63379a0 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index f0b932108..9f3519351 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index b0537c9d7..faa500091 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 5bc9c1154..8b3d1dba6 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index a5e39e6f3..d2e796c7c 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 1e3a84e43..7b29afaf7 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 063e54ebb..a98fc5232 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 2f9ad1336..f5668332c 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 65cf2c27c..e5035624e 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index e74c623f9..fa93115a7 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 2427b9707..707d0b8cc 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index b9b8750e6..b02907e4f 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index 0c093a0a5..05b1090cb 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index e69e8305f..d8321e32f 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index 25d113e6f..7d22a5d70 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.1 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 7d222704f..3490a34dc 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 caf-web diff --git a/pom.xml b/pom.xml index 40036e595..df099a169 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.1 pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - HEAD + v1.6.3-rc.1 @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-commons - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-commons-cryptography - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-commons-exception - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-commons-exception-diagnostic - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-commons-qrcode - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-commons-runtime - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-commons-serialization - 1.6.3-SNAPSHOT + 1.6.3-rc.1 @@ -733,265 +733,265 @@ io.iec.edp caf-business-context-core - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-business-context-dist - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-business-context-memory - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-context-api - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-data-jdbc - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-data-jpa - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-event - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-i18n-api - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-i18n-runtime - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-lock-api - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-lock-memory - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-lock-redis - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-lock-extension-jpa - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-logging - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-msu-api - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-msu-client - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-msu-common - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-msu-server - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-multicontext - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-multicontext-support - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rest - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rest-api - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rest-client - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rest-server - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rpc - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rpc-api - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rpc-client - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rpc-registry-api - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rpc-registry-core - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rpc-registry-db - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rpc-remote-http - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rpc-server - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-rpc-remote-grpc - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-session - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-session-api - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-session-backend - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-session-core - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-session-web - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-tenancy-api - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-tenancy-core - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-tenancy-repository-jpa - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-web - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-middleware - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-middleware-baolande - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-middleware-infrastructure - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-middleware-tomcat - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-middleware-tongweb - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-provider - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp @@ -1001,39 +1001,39 @@ io.iec.edp caf-session-provider - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-i18n-provider - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-security - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-security-api - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-model-api - 1.6.3-SNAPSHOT + 1.6.3-rc.1 io.iec.edp caf-model-core - 1.6.3-SNAPSHOT + 1.6.3-rc.1 -- Gitee From 79bc7f7a52b762db18036ca667390f61350c15fb Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Fri, 5 Jul 2024 05:45:56 +0000 Subject: [PATCH 17/54] [maven-release-plugin] prepare for next development iteration --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 4 +- caf-data/caf-data-multilang/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 134 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index b19516654..e8b2d6e2a 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 07996a7d1..3b0023e90 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index 868a6e7d5..be617c7ed 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index 1853acb93..ca6fefe54 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index 7d48f73fe..d5f179ddf 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index 6b745a496..c9e2c44d2 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index 95c9061cf..ccfec79b3 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index ac0685013..0c694d923 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index 57a108322..e7c0e1f93 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index b7b19ad52..a8cdaa195 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index d35bb818d..13a77e88f 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 338d65b74..c51ca2f36 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index f410166c4..43cb94350 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 1b70d191a..30d77419d 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index d92ac7f1e..2e8e38649 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 @@ -118,7 +118,7 @@ io.iec.edp caf-data-multilang - 1.6.3-rc.1 + 1.6.3-SNAPSHOT compile diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index b4bda366f..57c562daf 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-data-multilang diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 23d472415..edb80ec24 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index fd93e5f74..adb668a1e 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 9b91bb15f..1f54b7bb0 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index a8e95678b..83f5c5ba3 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 1b5b34992..986aec229 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index befe692b0..f2abd208d 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index c4f390ac8..844eb5f11 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index b02ac3020..9969ed416 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 445d1ca34..80124f947 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index 348e6b392..d1e6ac41b 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index 3f104f52e..ad6475865 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 2d96ef250..59ebca44e 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index 90f22e81a..dbef3d2e6 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 66fac5836..3065a68db 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 6e6a60fac..38482a30f 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index 02a4c7ab2..de1b2ab69 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 84b473b0f..233d4b55a 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index d46b9233b..15a833d5f 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index 75195070b..e6c0e3c5a 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index d0c01a675..80fa54b0f 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 882077051..2020cb1c4 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index c3fb6e632..1bbf6460b 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index c234131fd..0cb6ece40 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index aca7d985c..aee68ba2c 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index fea301f62..c05a064a1 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 4e6da5e73..72da3b750 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index b91733a5a..fc4c00c4f 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 54e89de80..196a9f061 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index db4952577..750e28f88 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index 4bf939a86..a749d6ffe 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 0ad1493b9..85aef6039 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index b3c5297ba..b5924fb4e 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index da41c46a9..44c9926d3 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index bcd3522af..e13a5a506 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 78361e2bf..1435f992c 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index b27d3656c..8cc504224 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index f95026b61..343def915 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index 6326acfad..f4f1abec6 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index 616f8e214..a5c6ccffa 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index c3ef91487..6e7e713ee 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index be63379a0..ef79ae04e 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index 9f3519351..f0b932108 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index faa500091..b0537c9d7 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 8b3d1dba6..5bc9c1154 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index d2e796c7c..a5e39e6f3 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 7b29afaf7..1e3a84e43 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index a98fc5232..063e54ebb 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index f5668332c..2f9ad1336 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index e5035624e..65cf2c27c 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index fa93115a7..e74c623f9 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 707d0b8cc..2427b9707 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index b02907e4f..b9b8750e6 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index 05b1090cb..0c093a0a5 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index d8321e32f..e69e8305f 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index 7d22a5d70..25d113e6f 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.1 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 3490a34dc..7d222704f 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT caf-web diff --git a/pom.xml b/pom.xml index df099a169..40036e595 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.3-rc.1 + 1.6.3-SNAPSHOT pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - v1.6.3-rc.1 + HEAD @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-cryptography - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-exception - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-exception-diagnostic - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-qrcode - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-runtime - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-serialization - 1.6.3-rc.1 + 1.6.3-SNAPSHOT @@ -733,265 +733,265 @@ io.iec.edp caf-business-context-core - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-business-context-dist - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-business-context-memory - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-context-api - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-data-jdbc - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-data-jpa - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-event - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-api - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-runtime - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-api - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-memory - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-redis - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-extension-jpa - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-logging - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-api - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-client - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-common - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-server - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-multicontext - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-multicontext-support - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rest - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-api - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-client - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-server - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-api - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-client - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-api - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-core - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-db - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-remote-http - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-server - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-remote-grpc - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-session - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-session-api - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-session-backend - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-session-core - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-session-web - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-api - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-core - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-repository-jpa - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-web - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-baolande - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-infrastructure - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-tomcat - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-tongweb - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-provider - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp @@ -1001,39 +1001,39 @@ io.iec.edp caf-session-provider - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-provider - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-security - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-security-api - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-model - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-model-api - 1.6.3-rc.1 + 1.6.3-SNAPSHOT io.iec.edp caf-model-core - 1.6.3-rc.1 + 1.6.3-SNAPSHOT -- Gitee From f99cac3e25cf435eb00f9deed6229bdf0cfa3108 Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Mon, 8 Jul 2024 13:12:00 +0800 Subject: [PATCH 18/54] =?UTF-8?q?=E4=BF=AE=E5=A4=8Drpc=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E4=BF=A1=E6=81=AFTypeSchema=E7=9A=84=E5=A4=9A=E6=80=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iec/edp/caf/rpc/api/entity/RpcParamDefinition.java | 2 ++ .../caf/rpc/api/entity/RpcReturnValueDefinition.java | 4 +++- .../edp/caf/rpc/registry/api/RpcDefinitionQuery.java | 8 +------- .../caf/rpc/registry/api/RpcDefinitionRegistry.java | 2 +- .../database/domain/manager/RpcDefinitionManager.java | 10 +++++++++- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/entity/RpcParamDefinition.java b/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/entity/RpcParamDefinition.java index aeaa2246b..f5ea0f9df 100644 --- a/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/entity/RpcParamDefinition.java +++ b/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/entity/RpcParamDefinition.java @@ -16,6 +16,7 @@ package io.iec.edp.caf.rpc.api.entity; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.iec.edp.caf.rpc.api.common.GspSerializeType; import io.iec.edp.caf.rpc.api.schema.TypeSchema; import lombok.Getter; @@ -39,6 +40,7 @@ public class RpcParamDefinition implements Serializable { private String description; //类型 + @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@type") private TypeSchema type; //必须 diff --git a/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/entity/RpcReturnValueDefinition.java b/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/entity/RpcReturnValueDefinition.java index 2b4ccf1ce..21a877d9b 100644 --- a/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/entity/RpcReturnValueDefinition.java +++ b/caf-rpc/caf-rpc-api/src/main/java/io/iec/edp/caf/rpc/api/entity/RpcReturnValueDefinition.java @@ -16,6 +16,7 @@ package io.iec.edp.caf.rpc.api.entity; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.iec.edp.caf.rpc.api.common.GspSerializeType; import io.iec.edp.caf.rpc.api.schema.TypeSchema; import lombok.Getter; @@ -24,7 +25,7 @@ import lombok.Setter; import java.io.Serializable; /** - * Rpc返回值定义 + * Rpc返回值定义 * * @author Leon Huo */ @@ -33,6 +34,7 @@ import java.io.Serializable; public class RpcReturnValueDefinition implements Serializable { //类型 + @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@type") private TypeSchema type; //序列化类型 private GspSerializeType serializeType = GspSerializeType.Json; diff --git a/caf-rpc/caf-rpc-registry-api/src/main/java/io/iec/edp/caf/rpc/registry/api/RpcDefinitionQuery.java b/caf-rpc/caf-rpc-registry-api/src/main/java/io/iec/edp/caf/rpc/registry/api/RpcDefinitionQuery.java index 8ad2927d4..4472165cc 100644 --- a/caf-rpc/caf-rpc-registry-api/src/main/java/io/iec/edp/caf/rpc/registry/api/RpcDefinitionQuery.java +++ b/caf-rpc/caf-rpc-registry-api/src/main/java/io/iec/edp/caf/rpc/registry/api/RpcDefinitionQuery.java @@ -16,10 +16,8 @@ package io.iec.edp.caf.rpc.registry.api; -import io.iec.edp.caf.rpc.api.annotation.GspReturnSerializeType; import io.iec.edp.caf.rpc.api.annotation.GspServiceBundle; import io.iec.edp.caf.rpc.api.annotation.RpcParam; -import io.iec.edp.caf.rpc.api.common.GspSerializeType; import io.iec.edp.caf.rpc.api.entity.RpcServiceDefinition; import java.util.List; @@ -29,17 +27,13 @@ import java.util.List; * 该接口BA,集成平台的都有使用，已有的改动需要谨慎 * @author Leon Huo */ -@GspServiceBundle(serviceUnitName = "Msu", serviceVersion = "1.0.0") +@GspServiceBundle(serviceUnitName = "pfcommon", serviceVersion = "1.0.0") public interface RpcDefinitionQuery { List queryList(); - @GspReturnSerializeType(paramSerializeType = GspSerializeType.Custom, - customSerializeTypeRef = "io.iec.edp.caf.rpc.api.serialize.RpcDefinitionSerializer") RpcServiceDefinition query(@RpcParam(paramName = "rpcServiceId") String rpcServiceId); - @GspReturnSerializeType(paramSerializeType = GspSerializeType.Custom, - customSerializeTypeRef = "io.iec.edp.caf.rpc.api.serialize.RpcDefinitionSerializer") List queryListBySu(@RpcParam(paramName = "suName") String suName); } diff --git a/caf-rpc/caf-rpc-registry-api/src/main/java/io/iec/edp/caf/rpc/registry/api/RpcDefinitionRegistry.java b/caf-rpc/caf-rpc-registry-api/src/main/java/io/iec/edp/caf/rpc/registry/api/RpcDefinitionRegistry.java index ae87dc460..e8aa0eb2a 100644 --- a/caf-rpc/caf-rpc-registry-api/src/main/java/io/iec/edp/caf/rpc/registry/api/RpcDefinitionRegistry.java +++ b/caf-rpc/caf-rpc-registry-api/src/main/java/io/iec/edp/caf/rpc/registry/api/RpcDefinitionRegistry.java @@ -28,7 +28,7 @@ import java.util.List; * * @author Leon Huo */ -@GspServiceBundle(serviceUnitName = "Msu", serviceVersion = "1.0.0") +@GspServiceBundle(serviceUnitName = "pfcommon", serviceVersion = "1.0.0") public interface RpcDefinitionRegistry { Boolean register(@RpcParam(paramName = "definitionList", diff --git a/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/manager/RpcDefinitionManager.java b/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/manager/RpcDefinitionManager.java index e839c5ba4..aaa1bf229 100644 --- a/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/manager/RpcDefinitionManager.java +++ b/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/manager/RpcDefinitionManager.java @@ -41,7 +41,15 @@ public class RpcDefinitionManager { } public Boolean saveRpcServiceMethodDefinition(List definitionList) { - methodRepository.saveAll(definitionList); + try { + methodRepository.saveAll(definitionList); + } catch (Exception e) { + for (RpcServiceMethodDefinitionEntity entity : definitionList) { + methodRepository.deleteById(entity.getId()); + } + methodRepository.saveAll(definitionList); + } + return true; } -- Gitee From 79bbe7ed80bdf4b1304d983ebc8d2f2933d89c71 Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Mon, 8 Jul 2024 14:12:02 +0800 Subject: [PATCH 19/54] =?UTF-8?q?=E8=B0=83=E6=95=B4jackson=E5=8F=8D?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E7=9A=84=E6=97=A5=E5=BF=97=E7=BA=A7?= =?UTF-8?q?=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/iec/edp/caf/commons/JacksonUtils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java index 51376fe59..11900cc69 100644 --- a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java +++ b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java @@ -133,7 +133,8 @@ class JacksonUtils { //return clazz.equals(String.class) ? (T) str : objectMapper.readValue(str, clazz); return objectMapper.readValue(str, clazz); } catch (Exception e) { - log.error("Parse Object to String error : {}", e.getMessage(),e); + //todo 临时调整为warn避免rpc定义注册到数据库时的报错日志，后续调整回error + log.warn("Parse Object to String error : {}", e.getMessage(),e); return null; } } @@ -190,7 +191,8 @@ class JacksonUtils { try { return objectMapper.readValue(str, javaType); } catch (IOException e) { - log.error("Parse Object to String error : {}", e.getMessage(),e); + //todo 临时调整为warn避免rpc定义注册到数据库时的报错日志，后续调整回error + log.warn("Parse Object to String error : {}", e.getMessage(),e); return null; } } -- Gitee From 75f89742fcadfe96d9f3e3681119eedb58bd5c54 Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Mon, 8 Jul 2024 14:37:04 +0800 Subject: [PATCH 20/54] =?UTF-8?q?=E8=BF=98=E5=8E=9FRpcDefinitionManager?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database/domain/manager/RpcDefinitionManager.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/manager/RpcDefinitionManager.java b/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/manager/RpcDefinitionManager.java index aaa1bf229..e839c5ba4 100644 --- a/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/manager/RpcDefinitionManager.java +++ b/caf-rpc/caf-rpc-registry-db/src/main/java/io/iec/edp/caf/rpc/registry/storage/database/domain/manager/RpcDefinitionManager.java @@ -41,15 +41,7 @@ public class RpcDefinitionManager { } public Boolean saveRpcServiceMethodDefinition(List definitionList) { - try { - methodRepository.saveAll(definitionList); - } catch (Exception e) { - for (RpcServiceMethodDefinitionEntity entity : definitionList) { - methodRepository.deleteById(entity.getId()); - } - methodRepository.saveAll(definitionList); - } - + methodRepository.saveAll(definitionList); return true; } -- Gitee From 6cae140cd399f5199c20ef2e4fa4a41a7d3d8ce7 Mon Sep 17 00:00:00 2001 From: yulongchao Date: Mon, 8 Jul 2024 16:07:11 +0800 Subject: [PATCH 21/54] =?UTF-8?q?=E9=9A=90=E5=BC=8F=E8=BD=AC=E5=8C=96?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/iec/edp/caf/commons/dataaccess/DbType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caf-data/caf-data-jdbc/src/main/java/io/iec/edp/caf/commons/dataaccess/DbType.java b/caf-data/caf-data-jdbc/src/main/java/io/iec/edp/caf/commons/dataaccess/DbType.java index f3b2ab2ba..106e89ea5 100644 --- a/caf-data/caf-data-jdbc/src/main/java/io/iec/edp/caf/commons/dataaccess/DbType.java +++ b/caf-data/caf-data-jdbc/src/main/java/io/iec/edp/caf/commons/dataaccess/DbType.java @@ -67,7 +67,7 @@ public enum DbType { * 用于隐式转换的判断 * @return */ - Boolean isImplicitConvert() { + public Boolean isImplicitConvert() { return this == SQLServer; } } -- Gitee From d26a4a03b05c1a26caac5d015af023079ae5f792 Mon Sep 17 00:00:00 2001 From: ljbonbon <1481281891@qq.com> Date: Wed, 10 Jul 2024 10:44:42 +0800 Subject: [PATCH 22/54] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java | 1 - .../edp/caf/tenancy/core/service/TenantService.java | 1 + .../edp/caf/tenancy/core/service/TenantManager.java | 10 ++++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java index 515d2da49..8dda0faf4 100644 --- a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java +++ b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/EmbeddedTenant.java @@ -52,7 +52,6 @@ public class EmbeddedTenant implements Serializable { public EmbeddedTenant(Tenant tenant){ this.id=tenant.getId(); this.code=tenant.getCode(); - this.name=new CAFMultiLanguageColumn(); this.createdTime=tenant.getCreatedTime(); } } diff --git a/caf-tenancy/caf-tenancy-core/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantService.java b/caf-tenancy/caf-tenancy-core/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantService.java index 2b6418b87..ec00a34ce 100644 --- a/caf-tenancy/caf-tenancy-core/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantService.java +++ b/caf-tenancy/caf-tenancy-core/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantService.java @@ -99,6 +99,7 @@ public class TenantService implements ITenantService { return this.tenantmgr.getAllTenants(language); } + @Override public Tenant getTenant(int tenantId, String language) { DataValidator.checkForNullReference(tenantId, "tenantId"); diff --git a/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java b/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java index 40e2e0992..710a5353b 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java +++ b/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java @@ -21,6 +21,7 @@ import io.iec.edp.caf.commons.exception.ExceptionLevel; import io.iec.edp.caf.commons.transaction.JpaTransaction; import io.iec.edp.caf.commons.transaction.TransactionPropagation; import io.iec.edp.caf.commons.utils.SpringBeanUtils; +import io.iec.edp.caf.data.multilang.CAFMultiLanguageColumn; import io.iec.edp.caf.i18n.api.LanguageSuffixProvider; import io.iec.edp.caf.tenancy.api.entity.AppInstanceInfo; import io.iec.edp.caf.tenancy.api.entity.EmbeddedTenant; @@ -223,13 +224,18 @@ public class TenantManager implements TenantPersistenceService { private void saveEmbeddedTenant(Tenant tenant) { Optional result = this.repository.findById(tenant.getId()); - EmbeddedTenant embeddedTenant = new EmbeddedTenant(tenant); if (result.isPresent()) { + EmbeddedTenant embeddedTenant = new EmbeddedTenant(tenant); EmbeddedTenant selectTenant = result.get(); selectTenant.getName().setValue(tenant.getName()); embeddedTenant.setName(selectTenant.getName()); + this.repository.save(embeddedTenant); + }else{ + EmbeddedTenant embeddedTenant=new EmbeddedTenant(tenant); + embeddedTenant.setName(new CAFMultiLanguageColumn()); + embeddedTenant.getName().setValue(tenant.getName()); + this.repository.save(embeddedTenant); } - this.repository.save(embeddedTenant); } /** * 根据租户标识获取缓存key -- Gitee From ea6c8a6d6ba7b2fa074e0cfff6f8d1aeec9e0a0b Mon Sep 17 00:00:00 2001 From: ljbonbon <1481281891@qq.com> Date: Wed, 10 Jul 2024 11:04:40 +0800 Subject: [PATCH 23/54] =?UTF-8?q?tomcat=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40036e595..c9cbcd1fe 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ 4.10.0 2.14.1 4.1.94.Final - 9.0.82 + 9.0.90 2.15.0 1.70 1.13 -- Gitee From 11b21d7163db422271aae54a70863e72e48ed519 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Wed, 10 Jul 2024 07:19:30 +0000 Subject: [PATCH 24/54] [maven-release-plugin] prepare release v1.6.3-rc.2 --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 4 +- caf-data/caf-data-multilang/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 134 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index e8b2d6e2a..052b8841a 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 3b0023e90..9004949af 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index be617c7ed..4d2ef1317 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index ca6fefe54..b6fbcab16 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index d5f179ddf..382f8b7ce 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index c9e2c44d2..a95ed63c0 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index ccfec79b3..724983e6e 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 0c694d923..b02781386 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index e7c0e1f93..cb9752a8c 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index a8cdaa195..cac45c672 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 13a77e88f..da005d72e 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index c51ca2f36..36558a895 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 43cb94350..cc5ca271b 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 30d77419d..498933ebc 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 2e8e38649..425a19230 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 @@ -118,7 +118,7 @@ io.iec.edp caf-data-multilang - 1.6.3-SNAPSHOT + 1.6.3-rc.2 compile diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index 57c562daf..47c2e5a27 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-data-multilang diff --git a/caf-data/pom.xml b/caf-data/pom.xml index edb80ec24..f5184099b 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index adb668a1e..2880444ee 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 1f54b7bb0..7b552d7e1 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 83f5c5ba3..3e6684c04 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 986aec229..a66d533a0 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index f2abd208d..06664ce8e 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 844eb5f11..3e69a56c2 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 9969ed416..1c3784afd 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 80124f947..ac867fa17 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index d1e6ac41b..99e91d74b 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index ad6475865..3c72576ed 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 59ebca44e..06f6e4a09 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index dbef3d2e6..cc3482481 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 3065a68db..78df13ac2 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 38482a30f..3f355018f 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index de1b2ab69..d89a527c8 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 233d4b55a..2a019c6fa 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 15a833d5f..4dad62208 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index e6c0e3c5a..0ba4d7a7f 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 80fa54b0f..35b637592 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 2020cb1c4..9dd9c582f 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 1bbf6460b..e3f53cfb9 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 0cb6ece40..49cdbb519 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index aee68ba2c..90cb36c35 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index c05a064a1..98f8439aa 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 72da3b750..73d3a106c 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index fc4c00c4f..1db0fad56 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 196a9f061..1cfbffc29 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 750e28f88..9ad598c84 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index a749d6ffe..129d056c1 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 85aef6039..a710f0683 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index b5924fb4e..072566ad6 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index 44c9926d3..c8f44f1b7 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index e13a5a506..6721cfeaa 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 1435f992c..664ef4e89 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 8cc504224..19839f8a8 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 343def915..77b9fc9e1 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index f4f1abec6..d54316b53 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index a5c6ccffa..e9c5f4ee7 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 6e7e713ee..f9cad52db 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index ef79ae04e..2ed4ca8f8 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index f0b932108..f00b782a8 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index b0537c9d7..cc5668b11 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 5bc9c1154..f3599c8c9 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index a5e39e6f3..9643a8c5e 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 1e3a84e43..2a0111122 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 063e54ebb..6f488b3b7 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 2f9ad1336..4f9254a09 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 65cf2c27c..e141ed9cb 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index e74c623f9..abdac7b7a 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 2427b9707..a1df09e91 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index b9b8750e6..f38c6ed7f 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index 0c093a0a5..01822ee28 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index e69e8305f..5640a6cba 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index 25d113e6f..1f51163ae 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.2 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 7d222704f..fefcd6295 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 caf-web diff --git a/pom.xml b/pom.xml index c9cbcd1fe..ce0c2cfa0 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.2 pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - HEAD + v1.6.3-rc.2 @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-commons - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-commons-cryptography - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-commons-exception - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-commons-exception-diagnostic - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-commons-qrcode - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-commons-runtime - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-commons-serialization - 1.6.3-SNAPSHOT + 1.6.3-rc.2 @@ -733,265 +733,265 @@ io.iec.edp caf-business-context-core - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-business-context-dist - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-business-context-memory - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-context-api - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-data-jdbc - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-data-jpa - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-event - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-i18n-api - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-i18n-runtime - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-lock-api - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-lock-memory - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-lock-redis - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-lock-extension-jpa - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-logging - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-msu-api - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-msu-client - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-msu-common - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-msu-server - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-multicontext - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-multicontext-support - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rest - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rest-api - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rest-client - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rest-server - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rpc - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rpc-api - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rpc-client - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rpc-registry-api - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rpc-registry-core - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rpc-registry-db - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rpc-remote-http - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rpc-server - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-rpc-remote-grpc - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-session - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-session-api - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-session-backend - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-session-core - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-session-web - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-tenancy-api - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-tenancy-core - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-tenancy-repository-jpa - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-web - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-middleware - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-middleware-baolande - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-middleware-infrastructure - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-middleware-tomcat - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-middleware-tongweb - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-provider - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp @@ -1001,39 +1001,39 @@ io.iec.edp caf-session-provider - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-i18n-provider - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-security - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-security-api - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-model-api - 1.6.3-SNAPSHOT + 1.6.3-rc.2 io.iec.edp caf-model-core - 1.6.3-SNAPSHOT + 1.6.3-rc.2 -- Gitee From eb97d8495af271aaa1206b49abcf4b83da5dbb9a Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Wed, 10 Jul 2024 07:19:30 +0000 Subject: [PATCH 25/54] [maven-release-plugin] prepare for next development iteration --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 4 +- caf-data/caf-data-multilang/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 134 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index 052b8841a..e8b2d6e2a 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 9004949af..3b0023e90 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index 4d2ef1317..be617c7ed 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index b6fbcab16..ca6fefe54 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index 382f8b7ce..d5f179ddf 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index a95ed63c0..c9e2c44d2 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index 724983e6e..ccfec79b3 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index b02781386..0c694d923 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index cb9752a8c..e7c0e1f93 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index cac45c672..a8cdaa195 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index da005d72e..13a77e88f 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 36558a895..c51ca2f36 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index cc5ca271b..43cb94350 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 498933ebc..30d77419d 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 425a19230..2e8e38649 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 @@ -118,7 +118,7 @@ io.iec.edp caf-data-multilang - 1.6.3-rc.2 + 1.6.3-SNAPSHOT compile diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-multilang/pom.xml index 47c2e5a27..57c562daf 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-multilang/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-data-multilang diff --git a/caf-data/pom.xml b/caf-data/pom.xml index f5184099b..edb80ec24 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index 2880444ee..adb668a1e 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 7b552d7e1..1f54b7bb0 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 3e6684c04..83f5c5ba3 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index a66d533a0..986aec229 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index 06664ce8e..f2abd208d 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 3e69a56c2..844eb5f11 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 1c3784afd..9969ed416 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index ac867fa17..80124f947 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index 99e91d74b..d1e6ac41b 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index 3c72576ed..ad6475865 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 06f6e4a09..59ebca44e 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index cc3482481..dbef3d2e6 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 78df13ac2..3065a68db 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 3f355018f..38482a30f 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index d89a527c8..de1b2ab69 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 2a019c6fa..233d4b55a 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 4dad62208..15a833d5f 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index 0ba4d7a7f..e6c0e3c5a 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 35b637592..80fa54b0f 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 9dd9c582f..2020cb1c4 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index e3f53cfb9..1bbf6460b 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 49cdbb519..0cb6ece40 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index 90cb36c35..aee68ba2c 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index 98f8439aa..c05a064a1 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 73d3a106c..72da3b750 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index 1db0fad56..fc4c00c4f 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 1cfbffc29..196a9f061 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 9ad598c84..750e28f88 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index 129d056c1..a749d6ffe 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index a710f0683..85aef6039 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index 072566ad6..b5924fb4e 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index c8f44f1b7..44c9926d3 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index 6721cfeaa..e13a5a506 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 664ef4e89..1435f992c 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 19839f8a8..8cc504224 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 77b9fc9e1..343def915 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index d54316b53..f4f1abec6 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index e9c5f4ee7..a5c6ccffa 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index f9cad52db..6e7e713ee 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index 2ed4ca8f8..ef79ae04e 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index f00b782a8..f0b932108 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index cc5668b11..b0537c9d7 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index f3599c8c9..5bc9c1154 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index 9643a8c5e..a5e39e6f3 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 2a0111122..1e3a84e43 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 6f488b3b7..063e54ebb 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 4f9254a09..2f9ad1336 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index e141ed9cb..65cf2c27c 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index abdac7b7a..e74c623f9 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index a1df09e91..2427b9707 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index f38c6ed7f..b9b8750e6 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index 01822ee28..0c093a0a5 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index 5640a6cba..e69e8305f 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index 1f51163ae..25d113e6f 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.2 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index fefcd6295..7d222704f 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT caf-web diff --git a/pom.xml b/pom.xml index ce0c2cfa0..c9cbcd1fe 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.3-rc.2 + 1.6.3-SNAPSHOT pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - v1.6.3-rc.2 + HEAD @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-cryptography - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-exception - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-exception-diagnostic - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-qrcode - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-runtime - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-serialization - 1.6.3-rc.2 + 1.6.3-SNAPSHOT @@ -733,265 +733,265 @@ io.iec.edp caf-business-context-core - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-business-context-dist - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-business-context-memory - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-context-api - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-data-jdbc - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-data-jpa - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-event - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-api - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-runtime - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-api - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-memory - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-redis - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-extension-jpa - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-logging - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-api - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-client - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-common - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-server - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-multicontext - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-multicontext-support - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rest - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-api - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-client - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-server - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-api - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-client - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-api - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-core - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-db - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-remote-http - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-server - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-remote-grpc - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-session - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-session-api - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-session-backend - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-session-core - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-session-web - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-api - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-core - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-repository-jpa - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-web - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-baolande - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-infrastructure - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-tomcat - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-tongweb - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-provider - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp @@ -1001,39 +1001,39 @@ io.iec.edp caf-session-provider - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-provider - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-security - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-security-api - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-model - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-model-api - 1.6.3-rc.2 + 1.6.3-SNAPSHOT io.iec.edp caf-model-core - 1.6.3-rc.2 + 1.6.3-SNAPSHOT -- Gitee From d557b5739a12b179198b8a9c45654bc80386b33b Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Tue, 16 Jul 2024 16:45:15 +0800 Subject: [PATCH 26/54] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=97=A7=E7=89=88?= =?UTF-8?q?=E5=92=8C=E6=96=B0=E7=89=88=E7=9A=84=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- caf-context/caf-context-api/pom.xml | 4 + .../caf/boot/context/CAFContextWrapper.java | 17 +- .../multilang/CAFContextLanguageResolver.java | 37 ++++ .../caf/core/context/CafContextWrapper.java | 17 +- ...ec.edp.caf.data.CAFCurrentLanguageResolver | 17 ++ .../pom.xml | 2 +- .../support/CafJpaLanguageThreadHolder.java | 0 .../caf/data/CAFCurrentLanguageResolver.java | 57 +++++++ .../multilang/CAFMultiLanguageColumn.java | 152 ++++++++--------- .../data/multilang/MulitLangColumnTest.java | 0 caf-data/caf-data-jpa/pom.xml | 10 +- .../jpa/repository/CafI18nColumnDict.java | 4 + .../config/CafJpaRepositoriesRegistrar.java | 14 +- .../support/CafJpaRepositoryImpl.java | 161 ++++++++++++------ .../utils/TemporaryHibernateIdentifier.java | 20 +++ caf-data/pom.xml | 2 +- .../edp/caf/tenancy/api/entity/Tenant.java | 15 +- .../tenancy/core/service/TenantManager.java | 29 +--- pom.xml | 5 + 19 files changed, 369 insertions(+), 194 deletions(-) create mode 100644 caf-context/caf-context-api/src/main/java/io/iec/edp/caf/context/data/multilang/CAFContextLanguageResolver.java create mode 100644 caf-context/caf-context-api/src/main/resources/META-INF/services/io.iec.edp.caf.data.CAFCurrentLanguageResolver rename caf-data/{caf-data-multilang => caf-data-jpa-i18n}/pom.xml (97%) rename caf-data/{caf-data-multilang => caf-data-jpa-i18n}/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaLanguageThreadHolder.java (100%) create mode 100644 caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/CAFCurrentLanguageResolver.java rename caf-data/{caf-data-multilang => caf-data-jpa-i18n}/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java (40%) rename caf-data/{caf-data-multilang => caf-data-jpa-i18n}/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java (100%) create mode 100644 caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index c51ca2f36..f0e309992 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -52,6 +52,10 @@ io.iec.edp caf-commons-runtime + + io.iec.edp + caf-data-jpa-i18n + io.iec.edp caf-i18n-api diff --git a/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/boot/context/CAFContextWrapper.java b/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/boot/context/CAFContextWrapper.java index 3159cde36..c7c91ff44 100644 --- a/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/boot/context/CAFContextWrapper.java +++ b/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/boot/context/CAFContextWrapper.java @@ -17,6 +17,7 @@ package io.iec.edp.caf.boot.context; import io.iec.caf.data.jpa.repository.support.CafJpaLanguageThreadHolder; +import io.iec.caf.data.jpa.utils.TemporaryHibernateIdentifier; import io.iec.edp.caf.commons.utils.SpringBeanUtils; import io.iec.edp.caf.core.session.CafSession; @@ -73,13 +74,15 @@ public class CAFContextWrapper { * @param language */ public void setCurrentLanguage(String language) { - initSuffixProvider(); - String currentLangSuffix = this.suffixProvider.getFieldSuffix(language); - - //设置当前语言后缀 - String ctxLangSuffix = PersistersContext.getCurrentLangSuffix(); - if (!currentLangSuffix.equals(ctxLangSuffix)) - PersistersContext.setCurrentLangSuffix(currentLangSuffix); + if (!TemporaryHibernateIdentifier.NATIVE) { + initSuffixProvider(); + String currentLangSuffix = this.suffixProvider.getFieldSuffix(language); + + //设置当前语言后缀 + String ctxLangSuffix = PersistersContext.getCurrentLangSuffix(); + if (!currentLangSuffix.equals(ctxLangSuffix)) + PersistersContext.setCurrentLangSuffix(currentLangSuffix); + } //设置语言列表 CafJpaLanguageThreadHolder.setLanguages(this.getLanguageList()); diff --git a/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/context/data/multilang/CAFContextLanguageResolver.java b/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/context/data/multilang/CAFContextLanguageResolver.java new file mode 100644 index 000000000..f2e4099b5 --- /dev/null +++ b/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/context/data/multilang/CAFContextLanguageResolver.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.iec.edp.caf.context.data.multilang; + +import io.iec.edp.caf.commons.utils.SpringBeanUtils; +import io.iec.edp.caf.core.context.ICAFContextService; +import io.iec.edp.caf.data.CAFCurrentLanguageResolver; + +import java.util.Objects; +import java.util.Optional; + +/** + * 提供上下文语言编号，实现 {@link CAFCurrentLanguageResolver} + */ +public class CAFContextLanguageResolver implements CAFCurrentLanguageResolver { + + @Override + public Optional getLanguage() { + ICAFContextService service = SpringBeanUtils.getBean(ICAFContextService.class); + return Objects.nonNull(service) ? Optional.ofNullable(service.getLanguage()): Optional.empty(); + } + +} diff --git a/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/core/context/CafContextWrapper.java b/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/core/context/CafContextWrapper.java index e7b4b36c8..270396376 100644 --- a/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/core/context/CafContextWrapper.java +++ b/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/core/context/CafContextWrapper.java @@ -17,6 +17,7 @@ package io.iec.edp.caf.core.context; import io.iec.caf.data.jpa.repository.support.CafJpaLanguageThreadHolder; +import io.iec.caf.data.jpa.utils.TemporaryHibernateIdentifier; import io.iec.edp.caf.boot.context.CAFContext; import io.iec.edp.caf.commons.utils.SpringBeanUtils; import io.iec.edp.caf.core.session.CafSession; @@ -69,13 +70,15 @@ public class CafContextWrapper { * @param language */ public void setCurrentLanguage(String language){ - initSuffixProvider(); - String currentLangSuffix = this.suffixProvider.getFieldSuffix(language); - - //设置当前语言后缀 - String ctxLangSuffix = PersistersContext.getCurrentLangSuffix(); - if(!currentLangSuffix.equals(ctxLangSuffix)) - PersistersContext.setCurrentLangSuffix(currentLangSuffix); + if (!TemporaryHibernateIdentifier.NATIVE) { + initSuffixProvider(); + String currentLangSuffix = this.suffixProvider.getFieldSuffix(language); + + //设置当前语言后缀 + String ctxLangSuffix = PersistersContext.getCurrentLangSuffix(); + if (!currentLangSuffix.equals(ctxLangSuffix)) + PersistersContext.setCurrentLangSuffix(currentLangSuffix); + } //设置语言列表 CafJpaLanguageThreadHolder.setLanguages(this.getLanguageList()); diff --git a/caf-context/caf-context-api/src/main/resources/META-INF/services/io.iec.edp.caf.data.CAFCurrentLanguageResolver b/caf-context/caf-context-api/src/main/resources/META-INF/services/io.iec.edp.caf.data.CAFCurrentLanguageResolver new file mode 100644 index 000000000..ad946e60c --- /dev/null +++ b/caf-context/caf-context-api/src/main/resources/META-INF/services/io.iec.edp.caf.data.CAFCurrentLanguageResolver @@ -0,0 +1,17 @@ +# +# Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +io.iec.edp.caf.context.data.multilang.CAFContextLanguageResolver diff --git a/caf-data/caf-data-multilang/pom.xml b/caf-data/caf-data-jpa-i18n/pom.xml similarity index 97% rename from caf-data/caf-data-multilang/pom.xml rename to caf-data/caf-data-jpa-i18n/pom.xml index 57c562daf..171071232 100644 --- a/caf-data/caf-data-multilang/pom.xml +++ b/caf-data/caf-data-jpa-i18n/pom.xml @@ -24,7 +24,7 @@ 1.6.3-SNAPSHOT - caf-data-multilang + caf-data-jpa-i18n diff --git a/caf-data/caf-data-multilang/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaLanguageThreadHolder.java b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaLanguageThreadHolder.java similarity index 100% rename from caf-data/caf-data-multilang/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaLanguageThreadHolder.java rename to caf-data/caf-data-jpa-i18n/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaLanguageThreadHolder.java diff --git a/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/CAFCurrentLanguageResolver.java b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/CAFCurrentLanguageResolver.java new file mode 100644 index 000000000..42fc06cb8 --- /dev/null +++ b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/CAFCurrentLanguageResolver.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.iec.edp.caf.data; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.util.Assert; + +import java.util.Optional; +import java.util.ServiceLoader; + +/** + * 多语列的SPI，获取当前语言 + */ +public interface CAFCurrentLanguageResolver { + + /** + * 获取当前语言 + */ + Optional getLanguage(); + + static CAFCurrentLanguageResolver getInstance() { + return CAFMultiLanguageResolverSelector.instance; + } + + class CAFMultiLanguageResolverSelector { + private static CAFCurrentLanguageResolver instance = null; + + static { + Logger log = LoggerFactory.getLogger(CAFCurrentLanguageResolver.class); + ServiceLoader resolvers = ServiceLoader.load(CAFCurrentLanguageResolver.class); + for (CAFCurrentLanguageResolver resolver : resolvers) { + instance = resolver; + } + + if (log.isDebugEnabled()) { + log.debug("current CAFCurrentLanguageResolver [{}]", instance.getClass().getName()); + } + Assert.notNull(instance, "[CAFCurrentLanguageResolver] is null, please check."); + } + } + +} diff --git a/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java similarity index 40% rename from caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java rename to caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java index 83ce548f0..0dd535996 100644 --- a/caf-data/caf-data-multilang/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java +++ b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java @@ -16,24 +16,22 @@ package io.iec.edp.caf.data.multilang; -import io.iec.caf.data.jpa.repository.support.CafJpaLanguageThreadHolder; -import lombok.Data; +import io.iec.edp.caf.data.CAFCurrentLanguageResolver; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.hibernate.persister.entity.PersistersContext; import javax.persistence.Embeddable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 多语嵌入类型映射列 * 项目扩展时暂时可以重写，扩展该类。 * 增加语言属性，扩展getValue方法，在MclColumns集合增加语言属性列名 */ +@Setter +@Getter @Slf4j -@Data @Embeddable public class CAFMultiLanguageColumn { @@ -59,6 +57,7 @@ public class CAFMultiLanguageColumn { private String cafMlcpt; private String cafMlces; + public CAFMultiLanguageColumn() { } @@ -68,23 +67,9 @@ public class CAFMultiLanguageColumn { * @param langCode 语言编号 */ public String getValue(String langCode) { - if (log.isDebugEnabled()) log.debug("current language is {}", langCode); + if (log.isDebugEnabled()) log.debug("Try to get multi-lang value with code: {} ", langCode); - Map langs = CafJpaLanguageThreadHolder.getLanguages(); - String suffix = langs.get(langCode); - if ("CHS".equalsIgnoreCase(suffix)) { - return cafMlcchs; - } else if ("EN".equalsIgnoreCase(suffix)) { - return cafMlcen; - } else if ("CHT".equalsIgnoreCase(suffix)) { - return cafMlccht; - } else if ("PT".equalsIgnoreCase(suffix)) { - return cafMlcpt; - } else if ("ES".equalsIgnoreCase(suffix)) { - return cafMlces; - } else { - return cafMlcchs; - } + return getLanguageValue(langCode); } /** @@ -93,22 +78,11 @@ public class CAFMultiLanguageColumn { * @param value 多语值 */ public void setValue(String value) { - String suffix = PersistersContext.getCurrentLangSuffix(); + String langCode = CAFCurrentLanguageResolver.getInstance().getLanguage().orElseThrow(NullPointerException::new); - if (log.isDebugEnabled()) log.debug("current language suffix is {}", suffix); + if (log.isDebugEnabled()) log.debug("Current language is {}, value is {}", langCode, value); - suffix = suffix.replaceAll("^_", ""); - if ("CHS".equalsIgnoreCase(suffix)) { - this.cafMlcchs = value; - } else if ("EN".equalsIgnoreCase(suffix)) { - this.cafMlcen = value; - } else if ("CHT".equalsIgnoreCase(suffix)) { - this.cafMlccht = value; - } else if ("PT".equalsIgnoreCase(suffix)) { - this.cafMlcpt = value; - } else if ("ES".equalsIgnoreCase(suffix)) { - this.cafMlces = value; - } + setLanguageValue(langCode, value); } /** @@ -116,74 +90,88 @@ public class CAFMultiLanguageColumn { * * @param i18nValues 多语Map <语言编号,对应值> */ - public void setI18nValues(Map i18nValues) { + @SuppressWarnings("unused") + public void setValues(Map i18nValues) { if (i18nValues != null) { - Map langs = CafJpaLanguageThreadHolder.getLanguages(); - i18nValues.forEach((langCode, value) -> { - String suffix = langs.get(langCode); - if (suffix != null) { - if ("CHS".equalsIgnoreCase(suffix)) { - this.cafMlcchs = value; - } else if ("EN".equalsIgnoreCase(suffix)) { - this.cafMlcen = value; - } else if ("CHT".equalsIgnoreCase(suffix)) { - this.cafMlccht = value; - } else if ("PT".equalsIgnoreCase(suffix)) { - this.cafMlcpt = value; - } else if ("ES".equalsIgnoreCase(suffix)) { - this.cafMlces = value; - } - } - }); + i18nValues.forEach(this::setLanguageValue); } } /** * 返回多语Map <语言编号,对应值> */ - @SuppressWarnings("JpaAttributeMemberSignatureInspection") - public Map getI18nValues() { + @SuppressWarnings("JpaAttributeTypeInspection") + public Map getValues() { Map i18nValues = new HashMap<>(); - //TODO getI18nValues()使用CafJpaLanguageThreadHolder 和 toString()使用PersistersContext, 没有统一的工具类获取上下文语言及系统启动语言，后续有统一工具时，建议调整 - Map langs = CafJpaLanguageThreadHolder.getLanguages(); - Map maps = reverseMap(langs); - if (cafMlcchs != null && langs.containsValue("CHS")) i18nValues.put(maps.get("CHS"), cafMlcchs); - if (cafMlcen != null && langs.containsValue("EN")) i18nValues.put(maps.get("EN"), cafMlcen); - if (cafMlccht != null && langs.containsValue("CHT")) i18nValues.put(maps.get("CHT"), cafMlccht); - if (cafMlcpt != null && langs.containsValue("PT")) i18nValues.put(maps.get("PT"), cafMlcpt); - if (cafMlces != null && langs.containsValue("ES")) i18nValues.put(maps.get("ES"), cafMlces); + if (cafMlcchs != null) i18nValues.put("zh-CHS", cafMlcchs); + if (cafMlcen != null) i18nValues.put("en", cafMlcen); + if (cafMlccht != null) i18nValues.put("zh-CHT", cafMlccht); + if (cafMlcpt != null) i18nValues.put("pt", cafMlcpt); + if (cafMlces != null) i18nValues.put("es", cafMlces); return i18nValues; } - private Map reverseMap(Map langs) { - Map map = new HashMap<>(); - langs.forEach((code, suffix) -> map.put(suffix, code)); - return map; - } - /** * 根据当前语言打印信息 */ + @Override public String toString() { - String suffix = PersistersContext.getCurrentLangSuffix(); + String langCode = CAFCurrentLanguageResolver.getInstance().getLanguage().orElseThrow(NullPointerException::new); - if (log.isDebugEnabled()) log.debug("current language suffix is {}", suffix); + if (log.isDebugEnabled()) log.debug("Current language is {}", langCode); - suffix = suffix.replaceAll("^_", ""); - if ("CHS".equalsIgnoreCase(suffix)) { + return getLanguageValue(langCode); + } + + + private String getLanguageValue(String langCode) { + if ("zh-CHS".equalsIgnoreCase(langCode)) { return cafMlcchs; - } else if ("EN".equalsIgnoreCase(suffix)) { + } else if ("en".equalsIgnoreCase(langCode)) { return cafMlcen; - } else if ("CHT".equalsIgnoreCase(suffix)) { + } else if ("zh-CHT".equalsIgnoreCase(langCode)) { return cafMlccht; - } else if ("PT".equalsIgnoreCase(suffix)) { + } else if ("pt".equalsIgnoreCase(langCode)) { return cafMlcpt; - } else if ("ES".equalsIgnoreCase(suffix)) { + } else if ("es".equalsIgnoreCase(langCode)) { return cafMlces; } else { - //TODO 上下文语言为空或者没有匹配时，返回null还是默认简体中？ - return null; + return cafMlcchs; } } + + + private void setLanguageValue(String langCode, String value) { + if ("zh-CHS".equalsIgnoreCase(langCode)) { + this.cafMlcchs = value; + } else if ("en".equalsIgnoreCase(langCode)) { + this.cafMlcen = value; + } else if ("zh-CHT".equalsIgnoreCase(langCode)) { + this.cafMlccht = value; + } else if ("pt".equalsIgnoreCase(langCode)) { + this.cafMlcpt = value; + } else if ("es".equalsIgnoreCase(langCode)) { + this.cafMlces = value; + } + } + + @Override + public final boolean equals(Object object) { + if (this == object) return true; + if (!(object instanceof CAFMultiLanguageColumn)) return false; + + CAFMultiLanguageColumn that = (CAFMultiLanguageColumn) object; + return Objects.equals(getCafMlcchs(), that.getCafMlcchs()) && Objects.equals(getCafMlcen(), that.getCafMlcen()) && Objects.equals(getCafMlccht(), that.getCafMlccht()) && Objects.equals(getCafMlcpt(), that.getCafMlcpt()) && Objects.equals(getCafMlces(), that.getCafMlces()); + } + + @Override + public int hashCode() { + int result = Objects.hashCode(getCafMlcchs()); + result = 31 * result + Objects.hashCode(getCafMlcen()); + result = 31 * result + Objects.hashCode(getCafMlccht()); + result = 31 * result + Objects.hashCode(getCafMlcpt()); + result = 31 * result + Objects.hashCode(getCafMlces()); + return result; + } } diff --git a/caf-data/caf-data-multilang/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java b/caf-data/caf-data-jpa-i18n/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java similarity index 100% rename from caf-data/caf-data-multilang/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java rename to caf-data/caf-data-jpa-i18n/src/test/java/io/iec/edp/caf/data/multilang/MulitLangColumnTest.java diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 2e8e38649..4ece45b7e 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -35,6 +35,10 @@ io.iec.edp caf-commons-serialization + + io.iec.edp + caf-data-jpa-i18n + org.projectlombok @@ -115,12 +119,6 @@ jakarta.persistence-api test - - io.iec.edp - caf-data-multilang - 1.6.3-SNAPSHOT - compile - diff --git a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/CafI18nColumnDict.java b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/CafI18nColumnDict.java index 23e0c8019..c688e804b 100644 --- a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/CafI18nColumnDict.java +++ b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/CafI18nColumnDict.java @@ -59,6 +59,10 @@ public class CafI18nColumnDict implements Serializable { colI18nValues.put(column, i18nValues); } + public void put(String column, Map langValueMap) { + colI18nValues.put(column, langValueMap); + } + /** * 返回平铺的带语言后缀列名 * 如：name 属性有两个多语言选项 _en 和 _zh, 值分别为 kettle 和 水壶，则返回 diff --git a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/config/CafJpaRepositoriesRegistrar.java b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/config/CafJpaRepositoriesRegistrar.java index 8af75a580..4fff9fdc3 100644 --- a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/config/CafJpaRepositoriesRegistrar.java +++ b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/config/CafJpaRepositoriesRegistrar.java @@ -18,6 +18,7 @@ package io.iec.caf.data.jpa.repository.config; import io.iec.caf.data.jpa.repository.CafI18nStringColumn; import io.iec.caf.data.jpa.spi.RepositoryResourceLoaderResolver; +import io.iec.caf.data.jpa.utils.TemporaryHibernateIdentifier; import io.iec.edp.caf.commons.runtime.CafEnvironment; import io.iec.edp.caf.commons.runtime.env.enums.StartupMode; import io.iec.edp.caf.data.multilang.CAFMultiLanguageColumn; @@ -136,12 +137,13 @@ public class CafJpaRepositoriesRegistrar extends RepositoryBeanDefinitionRegistr delegate.registerRepositoriesIn(registry, extension); - - Set basePackages = getPackagesToScan(metadata); - if (!basePackages.isEmpty()) { - collectI18nBeanDefinition(basePackages); - } else { - log.warn("No entity scan base package found. If you have any JPA Entities, please make sure config them with \"@EnableCafJpaRepositories\" or \"@EntityScan\""); + if (!TemporaryHibernateIdentifier.NATIVE) { + Set basePackages = getPackagesToScan(metadata); + if (!basePackages.isEmpty()) { + collectI18nBeanDefinition(basePackages); + } else { + log.warn("No entity scan base package found. If you have any JPA Entities, please make sure config them with \"@EnableCafJpaRepositories\" or \"@EntityScan\""); + } } } diff --git a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaRepositoryImpl.java b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaRepositoryImpl.java index 12687c319..d213b536b 100644 --- a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaRepositoryImpl.java +++ b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaRepositoryImpl.java @@ -22,7 +22,9 @@ import io.iec.caf.data.jpa.repository.CafJpaRepository; import io.iec.caf.data.jpa.repository.support.event.CafJpaRepositoryEvent; import io.iec.caf.data.jpa.repository.support.event.CafJpaRepositoryEventArgs; import io.iec.caf.data.jpa.repository.support.event.CafJpaRepositoryPublish; +import io.iec.caf.data.jpa.utils.TemporaryHibernateIdentifier; import io.iec.edp.caf.commons.utils.SpringBeanUtils; +import io.iec.edp.caf.data.multilang.CAFMultiLanguageColumn; import lombok.extern.slf4j.Slf4j; import lombok.var; import org.hibernate.metamodel.internal.MetamodelImpl; @@ -33,13 +35,10 @@ import org.springframework.data.jpa.repository.support.SimpleJpaRepository; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.Tuple; +import javax.persistence.*; import java.io.Serializable; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.lang.reflect.Field; +import java.util.*; /** * This is {@link CafJpaRepositoryImpl}. @@ -56,6 +55,8 @@ class CafJpaRepositoryImpl extends SimpleJpaReposito private final EntityManager entityManager; private final MetamodelImpl metamodel; + private final List i18nColumns = new ArrayList<>(); + public CafJpaRepositoryImpl(JpaEntityInformation entityInformation, EntityManager entityManager) { super(entityInformation, entityManager); @@ -65,6 +66,10 @@ class CafJpaRepositoryImpl extends SimpleJpaReposito throw new UnsupportedOperationException(); } this.metamodel = (MetamodelImpl) entityManager.getMetamodel(); + + if (!TemporaryHibernateIdentifier.NATIVE) { + resolveI18nColumns(entityInformation.getJavaType()); + } } @@ -121,8 +126,8 @@ class CafJpaRepositoryImpl extends SimpleJpaReposito } var jpaRepoEvent = SpringBeanUtils.getBean(CafJpaRepositoryPublish.class); - if(jpaRepoEvent!=null){ - CafJpaRepositoryEventArgs args = new CafJpaRepositoryEventArgs(dict.getAllColumnsDict(),entity,dict); + if (jpaRepoEvent != null) { + CafJpaRepositoryEventArgs args = new CafJpaRepositoryEventArgs(Objects.requireNonNull(dict).getAllColumnsDict(), entity, dict); CafJpaRepositoryEvent event = new CafJpaRepositoryEvent(args); jpaRepoEvent.onHandleCafJpaRepoSave(event); } @@ -132,56 +137,114 @@ class CafJpaRepositoryImpl extends SimpleJpaReposito } - - @SuppressWarnings("unchecked") @Override public Optional> findByIdWithAllI18nColumn(Serializable id) { Optional persistedEntity = findById(id); - Class entityClass = entityInformation.getJavaType(); - AbstractEntityPersister persister = (AbstractEntityPersister) metamodel.entityPersister(entityClass); + if (!TemporaryHibernateIdentifier.NATIVE) { + Class entityClass = entityInformation.getJavaType(); + AbstractEntityPersister persister = (AbstractEntityPersister) metamodel.entityPersister(entityClass); - List columns = PersistersContext.getI18nEntityColumnsMap().get(entityClass.getCanonicalName()); -// List langs = PersistersContext.getCurrentLangList(); - Map langs = CafJpaLanguageThreadHolder.getLanguages(); + List columns = PersistersContext.getI18nEntityColumnsMap().get(entityClass.getCanonicalName()); + Map langs = CafJpaLanguageThreadHolder.getLanguages(); - if (persistedEntity.isPresent() && (CollectionUtils.isEmpty(columns) || CollectionUtils.isEmpty(langs))) { - log.warn(CollectionUtils.isEmpty(columns) ? "Can not find any i18n columns." : "Can not find any languages."); - return Optional.of(CafI18nEntity.builder().entity(persistedEntity.get()).build()); - } else if (!persistedEntity.isPresent()) { - return Optional.empty(); - } + if (persistedEntity.isPresent() && (CollectionUtils.isEmpty(columns) || CollectionUtils.isEmpty(langs))) { + log.warn(CollectionUtils.isEmpty(columns) ? "Can not find any i18n columns." : "Can not find any languages."); + return Optional.of(CafI18nEntity.builder().entity(persistedEntity.get()).build()); + } else if (!persistedEntity.isPresent()) { + return Optional.empty(); + } + + StringBuilder sqlBuilder = new StringBuilder().append("select "); + String[] idNames = persister.getIdentifierColumnNames(); + columns.forEach((c) -> langs.entrySet().forEach((l) -> + sqlBuilder.append(c).append("_").append(l.getValue().replaceAll("^_", "")).append(", "))); + sqlBuilder + .deleteCharAt(sqlBuilder.length() - 2) + .append("from ").append(persister.getRootTableName()) + .append(" where ").append(idNames[0]).append(" = :id"); + List tuples = entityManager + .createNativeQuery(sqlBuilder.toString(), Tuple.class) + .setParameter("id", id) + .getResultList(); + Object[] values = tuples.get(0).toArray(); + + CafI18nColumnDict dict = new CafI18nColumnDict(); + for (int i = 0; i < columns.size(); i++) { + String col = columns.get(i); + int j = 0; + for (Map.Entry entry : langs.entrySet()) { + var value = values[i * langs.size() + j]; + if (value != null) + dict.put(col, entry.getKey(), String.valueOf(value)); + j++; + } + } + + CafI18nEntity entity = CafI18nEntity.builder() + .entity(persistedEntity.get()) + .dict(dict) + .build(); + return Optional.of(entity); + } else { + Map langs = CafJpaLanguageThreadHolder.getLanguages(); + + if (persistedEntity.isPresent() && (CollectionUtils.isEmpty(i18nColumns) || CollectionUtils.isEmpty(langs))) { + log.warn(CollectionUtils.isEmpty(i18nColumns) ? "Can not find any i18n columns." : "Can not find any languages."); + return Optional.of(CafI18nEntity.builder().entity(persistedEntity.get()).build()); + } else if (!persistedEntity.isPresent()) { + return Optional.empty(); + } - StringBuilder sqlBuilder = new StringBuilder().append("select "); - String[] idNames = persister.getIdentifierColumnNames(); - columns.forEach((c) -> langs.entrySet().forEach((l) -> - sqlBuilder.append(c).append("_").append(l.getValue().replaceAll("^_", "")).append(", "))); - sqlBuilder - .deleteCharAt(sqlBuilder.length() - 2) - .append("from ").append(persister.getRootTableName()) - .append(" where ").append(idNames[0]).append(" = :id"); - List tuples = entityManager - .createNativeQuery(sqlBuilder.toString(), Tuple.class) - .setParameter("id", id) - .getResultList(); - Object[] values = tuples.get(0).toArray(); - - CafI18nColumnDict dict = new CafI18nColumnDict(); - for (int i = 0; i < columns.size(); i++) { - String col = columns.get(i); - int j = 0; - for (Map.Entry entry : langs.entrySet()) { - var value = values[i * langs.size() + j]; - if (value != null) - dict.put(col, entry.getKey(), String.valueOf(value)); - j++; + E e = persistedEntity.get(); + CafI18nColumnDict dict = new CafI18nColumnDict(); + for (Field column : i18nColumns) { + column.setAccessible(true); + try { + Object cols = column.get(e); + if (cols instanceof CAFMultiLanguageColumn) { + CAFMultiLanguageColumn ele = (CAFMultiLanguageColumn) cols; + dict.put(column.getName(), ele.getValues()); + } + } catch (IllegalAccessException exception) { + log.error("Can not access field [{}] of entity [{}]", column.getName(), e.getClass(), exception); + } } + + CafI18nEntity entity = CafI18nEntity.builder() + .entity(persistedEntity.get()) + .dict(dict) + .build(); + return Optional.of(entity); } + } + + private void resolveEmbeddedClass(Class embeddedClazz) { + resolveI18nColumns(embeddedClazz); + } + + private void resolveSuperClass(Class superClazz) { + resolveI18nColumns(superClazz); + } - CafI18nEntity entity = CafI18nEntity.builder() - .entity(persistedEntity.get()) - .dict(dict) - .build(); - return Optional.of(entity); + private void resolveI18nColumns(Class clazz) { + Class superClazz = clazz.getSuperclass(); + if (superClazz != null && !(superClazz == Object.class)) { + resolveSuperClass(superClazz); + } + Field[] fields = clazz.getDeclaredFields(); + for (Field field : fields) { + if (field.getAnnotation(Transient.class) != null) { + continue; + } + if (field.getAnnotation(Embedded.class) != null) { + if (field.getType() == CAFMultiLanguageColumn.class) { + i18nColumns.add(field); + } else { + resolveEmbeddedClass(field.getType()); + } + } + } } + } diff --git a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java new file mode 100644 index 000000000..e6607b514 --- /dev/null +++ b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java @@ -0,0 +1,20 @@ +package io.iec.caf.data.jpa.utils; + +/** + * TODO 为切换工具提供，临时用于环境中hibernate原生版与定制版的区分。后续升级后删除 + */ +@Deprecated +public class TemporaryHibernateIdentifier { + + @Deprecated + public static boolean NATIVE = false; + + static { + try { + Class.forName("org.hibernate.persister.entity.PersistersContext"); + } catch (ClassNotFoundException e) { + NATIVE = true; + } + } + +} diff --git a/caf-data/pom.xml b/caf-data/pom.xml index edb80ec24..2c891b4de 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -30,7 +30,7 @@ caf-data-jpa caf-data-jdbc - caf-data-multilang + caf-data-jpa-i18n diff --git a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java index 9595fce6c..70aa0a962 100644 --- a/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java +++ b/caf-tenancy/caf-tenancy-api/src/main/java/io/iec/edp/caf/tenancy/api/entity/Tenant.java @@ -16,13 +16,8 @@ package io.iec.edp.caf.tenancy.api.entity; -import io.iec.caf.data.jpa.repository.CafI18nStringColumn; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.io.Serializable; import java.util.Date; @@ -67,11 +62,11 @@ public class Tenant implements Serializable { public Tenant(){} - public Tenant(EmbeddedTenant embeddedTenant){ - this.id=embeddedTenant.getId(); - this.code=embeddedTenant.getCode(); - this.name=embeddedTenant.getName().toString(); - this.createdTime=embeddedTenant.getCreatedTime(); + public Tenant(EmbeddedTenant embeddedTenant, String language) { + this.id = embeddedTenant.getId(); + this.code = embeddedTenant.getCode(); + this.name = embeddedTenant.getName() != null ? embeddedTenant.getName().getValue(language) : null; + this.createdTime = embeddedTenant.getCreatedTime(); } } diff --git a/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java b/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java index 710a5353b..034eed223 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java +++ b/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java @@ -16,13 +16,10 @@ package io.iec.edp.caf.tenancy.core.service; -import io.iec.caf.data.jpa.repository.CafI18nColumnDict; import io.iec.edp.caf.commons.exception.ExceptionLevel; import io.iec.edp.caf.commons.transaction.JpaTransaction; import io.iec.edp.caf.commons.transaction.TransactionPropagation; -import io.iec.edp.caf.commons.utils.SpringBeanUtils; import io.iec.edp.caf.data.multilang.CAFMultiLanguageColumn; -import io.iec.edp.caf.i18n.api.LanguageSuffixProvider; import io.iec.edp.caf.tenancy.api.entity.AppInstanceInfo; import io.iec.edp.caf.tenancy.api.entity.EmbeddedTenant; import io.iec.edp.caf.tenancy.api.entity.Tenant; @@ -35,7 +32,6 @@ import io.iec.edp.caf.tenancy.core.utils.DataValidator; import lombok.var; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.persister.entity.PersistersContext; import java.util.*; @@ -89,11 +85,9 @@ public class TenantManager implements TenantPersistenceService { try { if (tenant == null) { - this.setLanguageFieldSuffix(language); -// String suffix = this.langRepository.findByCode(language).getFieldSuffix(); var tmp = this.repository.findById(tenantId); if (tmp.isPresent()) { - tenant = new Tenant(tmp.get()); + tenant = new Tenant(tmp.get(),language); } this.addCache(tenantId, language, tenant); } @@ -130,13 +124,11 @@ public class TenantManager implements TenantPersistenceService { //若已缓存 if(allTenantsCache.containsKey(language)) return allTenantsCache.get(language); else{ -// String suffix = this.langRepository.findByCode(language).getFieldSuffix(); - this.setLanguageFieldSuffix(language); List allEmbeddedTenants = this.repository.findAll(); List allTenants=new ArrayList<>(); if(allEmbeddedTenants!=null&&allEmbeddedTenants.size()>0){ for(EmbeddedTenant embeddedTenant:allEmbeddedTenants){ - allTenants.add(new Tenant(embeddedTenant)); + allTenants.add(new Tenant(embeddedTenant,language)); } } allTenantsCache.put(language,allTenants); @@ -152,11 +144,10 @@ public class TenantManager implements TenantPersistenceService { public Tenant getByCode(String tenantCode, String language) { DataValidator.checkForEmptyString(tenantCode, "tenantCode"); - this.setLanguageFieldSuffix(language); EmbeddedTenant embeddedTenant=this.repository.findByCode(tenantCode); Tenant tenant=null; if(embeddedTenant!=null){ - tenant=new Tenant(embeddedTenant); + tenant=new Tenant(embeddedTenant,language); } return tenant; } @@ -175,9 +166,7 @@ public class TenantManager implements TenantPersistenceService { if (tenant != null) { - // String suffix = this.langRepository.findByCode(language).getFieldSuffix(); - this.setLanguageFieldSuffix(language); - saveEmbeddedTenant(tenant); + saveEmbeddedTenant(tenant); this.addCache(tenant.getId(), language, tenant); } } @@ -301,15 +290,5 @@ public class TenantManager implements TenantPersistenceService { } tenantCache.remove(cacheKey); } - /** - * 设置语言后缀 - */ - private void setLanguageFieldSuffix(String language){ - LanguageSuffixProvider suffixProvider = SpringBeanUtils.getBean(LanguageSuffixProvider.class); - String currentLangSuffix = suffixProvider.getFieldSuffix(language); - String ctxLangSuffix = PersistersContext.getCurrentLangSuffix(); - if(!currentLangSuffix.equals(ctxLangSuffix)) - PersistersContext.setCurrentLangSuffix(currentLangSuffix); - } } diff --git a/pom.xml b/pom.xml index c9cbcd1fe..3fd0917ea 100644 --- a/pom.xml +++ b/pom.xml @@ -761,6 +761,11 @@ caf-data-jpa 1.6.3-SNAPSHOT + + io.iec.edp + caf-data-jpa-i18n + 1.6.3-SNAPSHOT + io.iec.edp -- Gitee From 5990542f458aee1c76e1000cceeaee4b3ea27f0d Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Tue, 16 Jul 2024 17:38:20 +0800 Subject: [PATCH 27/54] =?UTF-8?q?=E4=BF=AE=E6=AD=A3CafJpaRepo=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E5=88=97=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../caf/data/jpa/repository/support/CafJpaRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaRepositoryImpl.java b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaRepositoryImpl.java index d213b536b..30b6a7d40 100644 --- a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaRepositoryImpl.java +++ b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/repository/support/CafJpaRepositoryImpl.java @@ -67,7 +67,7 @@ class CafJpaRepositoryImpl extends SimpleJpaReposito } this.metamodel = (MetamodelImpl) entityManager.getMetamodel(); - if (!TemporaryHibernateIdentifier.NATIVE) { + if (TemporaryHibernateIdentifier.NATIVE) { resolveI18nColumns(entityInformation.getJavaType()); } } -- Gitee From 1fb01e9b9067011a31e862ef58314aa49d6ff4d2 Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Tue, 16 Jul 2024 18:19:26 +0800 Subject: [PATCH 28/54] =?UTF-8?q?=E8=B0=83=E6=95=B4hibernate=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=88=A4=E6=96=AD=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../caf/data/jpa/utils/TemporaryHibernateIdentifier.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java index e6607b514..523a7e854 100644 --- a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java +++ b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java @@ -10,11 +10,8 @@ public class TemporaryHibernateIdentifier { public static boolean NATIVE = false; static { - try { - Class.forName("org.hibernate.persister.entity.PersistersContext"); - } catch (ClassNotFoundException e) { - NATIVE = true; - } + String property = System.getProperty("caf.hibernate.native"); + NATIVE = Boolean.parseBoolean(property); } } -- Gitee From a9245306f9d2ca7cc54b6a6d37a28a0e5253795c Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Tue, 16 Jul 2024 18:28:10 +0800 Subject: [PATCH 29/54] =?UTF-8?q?=E8=B0=83=E6=95=B4TemporaryHibernateIdent?= =?UTF-8?q?ifier=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java index 523a7e854..a054b0dbf 100644 --- a/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java +++ b/caf-data/caf-data-jpa/src/main/java/io/iec/caf/data/jpa/utils/TemporaryHibernateIdentifier.java @@ -1,7 +1,7 @@ package io.iec.caf.data.jpa.utils; /** - * TODO 为切换工具提供，临时用于环境中hibernate原生版与定制版的区分。后续升级后删除 + * 禁止外部使用！此类临时用来识别当前环境的hibernate版本，后续升级后将删除。 */ @Deprecated public class TemporaryHibernateIdentifier { -- Gitee From 7908febec2178f8ca226460153a37bb35e676187 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Wed, 17 Jul 2024 01:38:50 +0000 Subject: [PATCH 30/54] [maven-release-plugin] prepare release v1.6.3-rc.3 --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa-i18n/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 136 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index e8b2d6e2a..2b5cd59af 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 3b0023e90..51702b34c 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index be617c7ed..febd9127c 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index ca6fefe54..09515ed51 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index d5f179ddf..c2d65b62f 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index c9e2c44d2..4ca1c661d 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index ccfec79b3..80cb1d2b3 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 0c694d923..8de99302c 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index e7c0e1f93..6e49e788d 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index a8cdaa195..ab03466f7 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 13a77e88f..e75c0ca9f 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index f0e309992..85d313fe0 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 43cb94350..e9bd5c9cc 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 30d77419d..68d95b97b 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-data/caf-data-jpa-i18n/pom.xml b/caf-data/caf-data-jpa-i18n/pom.xml index 171071232..9c7748b39 100644 --- a/caf-data/caf-data-jpa-i18n/pom.xml +++ b/caf-data/caf-data-jpa-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-data-jpa-i18n diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 4ece45b7e..e203a291a 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 2c891b4de..a3d71ba89 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index adb668a1e..1c96a5029 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 1f54b7bb0..5b4bb0821 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 83f5c5ba3..80c780dd5 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 986aec229..4e6bd82d6 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index f2abd208d..fbe522608 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 844eb5f11..8bc503407 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 9969ed416..6b4abc603 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 80124f947..bc1ae3de7 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index d1e6ac41b..ccab51e80 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index ad6475865..fb2d40920 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 59ebca44e..42e7ee466 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index dbef3d2e6..a82f6e736 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 3065a68db..7115a7c15 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 38482a30f..7c0502006 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index de1b2ab69..6a0789b46 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 233d4b55a..dc8ca2bc0 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 15a833d5f..e389c1b92 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index e6c0e3c5a..9b6c02bb2 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 80fa54b0f..919efff9f 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 2020cb1c4..b9a4176bf 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 1bbf6460b..3fd410a75 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 0cb6ece40..ac6ef3e11 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index aee68ba2c..3da1d6b44 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index c05a064a1..45931be41 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 72da3b750..ccb2b909d 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index fc4c00c4f..caaf7fc99 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 196a9f061..31959974b 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 750e28f88..6df33e081 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index a749d6ffe..a59cbbd54 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 85aef6039..32dbb35bd 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index b5924fb4e..e0b4236fd 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index 44c9926d3..2695b36dd 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index e13a5a506..909cbfa36 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 1435f992c..3bddc1aae 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 8cc504224..a2dceed52 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 343def915..1f64ed715 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index f4f1abec6..b466c2ebc 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index a5c6ccffa..311cd4436 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 6e7e713ee..0bc4bf3ea 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index ef79ae04e..a9bde7077 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index f0b932108..6cec23ae9 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index b0537c9d7..617fbe7ac 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 5bc9c1154..91bdf7b0a 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index a5e39e6f3..20c4fbee4 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 1e3a84e43..adaebdad7 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 063e54ebb..603cccbbc 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 2f9ad1336..e301f2558 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 65cf2c27c..08eb58419 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index e74c623f9..aa6b573b5 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 2427b9707..705cbab2c 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index b9b8750e6..2a0f90edb 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index 0c093a0a5..ce80caf77 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index e69e8305f..c8a10aa1b 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index 25d113e6f..d34b45996 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3-rc.3 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 7d222704f..690c8bc9a 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 caf-web diff --git a/pom.xml b/pom.xml index 3fd0917ea..5fb041839 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3-rc.3 pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - HEAD + v1.6.3-rc.3 @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-commons - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-commons-cryptography - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-commons-exception - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-commons-exception-diagnostic - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-commons-qrcode - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-commons-runtime - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-commons-serialization - 1.6.3-SNAPSHOT + 1.6.3-rc.3 @@ -733,270 +733,270 @@ io.iec.edp caf-business-context-core - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-business-context-dist - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-business-context-memory - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-context-api - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-data-jdbc - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-data-jpa - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-data-jpa-i18n - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-event - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-i18n-api - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-i18n-runtime - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-lock-api - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-lock-memory - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-lock-redis - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-lock-extension-jpa - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-logging - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-msu-api - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-msu-client - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-msu-common - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-msu-server - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-multicontext - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-multicontext-support - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rest - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rest-api - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rest-client - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rest-server - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rpc - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rpc-api - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rpc-client - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rpc-registry-api - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rpc-registry-core - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rpc-registry-db - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rpc-remote-http - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rpc-server - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-rpc-remote-grpc - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-session - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-session-api - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-session-backend - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-session-core - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-session-web - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-tenancy-api - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-tenancy-core - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-tenancy-repository-jpa - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-web - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-middleware - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-middleware-baolande - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-middleware-infrastructure - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-middleware-tomcat - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-middleware-tongweb - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-provider - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp @@ -1006,39 +1006,39 @@ io.iec.edp caf-session-provider - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-i18n-provider - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-security - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-security-api - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-model-api - 1.6.3-SNAPSHOT + 1.6.3-rc.3 io.iec.edp caf-model-core - 1.6.3-SNAPSHOT + 1.6.3-rc.3 -- Gitee From 1b41caa076ab681f2cc2c73fee9dc6b8c9099176 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Wed, 17 Jul 2024 01:38:50 +0000 Subject: [PATCH 31/54] [maven-release-plugin] prepare for next development iteration --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa-i18n/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 136 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index 2b5cd59af..e8b2d6e2a 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 51702b34c..3b0023e90 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index febd9127c..be617c7ed 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index 09515ed51..ca6fefe54 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index c2d65b62f..d5f179ddf 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index 4ca1c661d..c9e2c44d2 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index 80cb1d2b3..ccfec79b3 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 8de99302c..0c694d923 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index 6e49e788d..e7c0e1f93 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index ab03466f7..a8cdaa195 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index e75c0ca9f..13a77e88f 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 85d313fe0..f0e309992 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index e9bd5c9cc..43cb94350 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 68d95b97b..30d77419d 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-data/caf-data-jpa-i18n/pom.xml b/caf-data/caf-data-jpa-i18n/pom.xml index 9c7748b39..171071232 100644 --- a/caf-data/caf-data-jpa-i18n/pom.xml +++ b/caf-data/caf-data-jpa-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-data-jpa-i18n diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index e203a291a..4ece45b7e 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-data/pom.xml b/caf-data/pom.xml index a3d71ba89..2c891b4de 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index 1c96a5029..adb668a1e 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 5b4bb0821..1f54b7bb0 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 80c780dd5..83f5c5ba3 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 4e6bd82d6..986aec229 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index fbe522608..f2abd208d 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 8bc503407..844eb5f11 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 6b4abc603..9969ed416 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index bc1ae3de7..80124f947 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index ccab51e80..d1e6ac41b 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index fb2d40920..ad6475865 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 42e7ee466..59ebca44e 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index a82f6e736..dbef3d2e6 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 7115a7c15..3065a68db 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 7c0502006..38482a30f 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index 6a0789b46..de1b2ab69 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index dc8ca2bc0..233d4b55a 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index e389c1b92..15a833d5f 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index 9b6c02bb2..e6c0e3c5a 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 919efff9f..80fa54b0f 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index b9a4176bf..2020cb1c4 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 3fd410a75..1bbf6460b 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index ac6ef3e11..0cb6ece40 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index 3da1d6b44..aee68ba2c 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index 45931be41..c05a064a1 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index ccb2b909d..72da3b750 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index caaf7fc99..fc4c00c4f 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 31959974b..196a9f061 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 6df33e081..750e28f88 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index a59cbbd54..a749d6ffe 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 32dbb35bd..85aef6039 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index e0b4236fd..b5924fb4e 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index 2695b36dd..44c9926d3 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index 909cbfa36..e13a5a506 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 3bddc1aae..1435f992c 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index a2dceed52..8cc504224 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 1f64ed715..343def915 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index b466c2ebc..f4f1abec6 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index 311cd4436..a5c6ccffa 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 0bc4bf3ea..6e7e713ee 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index a9bde7077..ef79ae04e 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index 6cec23ae9..f0b932108 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index 617fbe7ac..b0537c9d7 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 91bdf7b0a..5bc9c1154 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index 20c4fbee4..a5e39e6f3 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index adaebdad7..1e3a84e43 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 603cccbbc..063e54ebb 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index e301f2558..2f9ad1336 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 08eb58419..65cf2c27c 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index aa6b573b5..e74c623f9 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 705cbab2c..2427b9707 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index 2a0f90edb..b9b8750e6 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index ce80caf77..0c093a0a5 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index c8a10aa1b..e69e8305f 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index d34b45996..25d113e6f 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-rc.3 + 1.6.3-SNAPSHOT 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 690c8bc9a..7d222704f 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT caf-web diff --git a/pom.xml b/pom.xml index 5fb041839..3fd0917ea 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.3-rc.3 + 1.6.3-SNAPSHOT pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - v1.6.3-rc.3 + HEAD @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-commons - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-cryptography - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-exception - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-exception-diagnostic - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-qrcode - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-runtime - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-commons-serialization - 1.6.3-rc.3 + 1.6.3-SNAPSHOT @@ -733,270 +733,270 @@ io.iec.edp caf-business-context-core - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-business-context-dist - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-business-context-memory - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-context-api - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-data-jdbc - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-data-jpa - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-data-jpa-i18n - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-event - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-api - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-runtime - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-api - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-memory - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-redis - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-lock-extension-jpa - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-logging - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-api - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-client - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-common - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-msu-server - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-multicontext - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-multicontext-support - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rest - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-api - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-client - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rest-server - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-api - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-client - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-api - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-core - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-registry-db - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-remote-http - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-server - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-rpc-remote-grpc - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-session - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-session-api - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-session-backend - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-session-core - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-session-web - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-api - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-core - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-tenancy-repository-jpa - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-web - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-baolande - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-infrastructure - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-tomcat - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-middleware-tongweb - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-provider - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp @@ -1006,39 +1006,39 @@ io.iec.edp caf-session-provider - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-i18n-provider - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-security - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-security-api - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-model - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-model-api - 1.6.3-rc.3 + 1.6.3-SNAPSHOT io.iec.edp caf-model-core - 1.6.3-rc.3 + 1.6.3-SNAPSHOT -- Gitee From 9219d3db2b1f956f9e13557063206a4690df5a97 Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Thu, 18 Jul 2024 11:34:20 +0800 Subject: [PATCH 32/54] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BF=9D=E8=AF=81?= =?UTF-8?q?=E6=97=A7=E7=89=88=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenancy/core/service/TenantManager.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java b/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java index 034eed223..1c6f163b6 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java +++ b/caf-tenancy/caf-tenancy-repository-jpa/src/main/java/io/iec/edp/caf/tenancy/core/service/TenantManager.java @@ -16,10 +16,13 @@ package io.iec.edp.caf.tenancy.core.service; +import io.iec.caf.data.jpa.utils.TemporaryHibernateIdentifier; import io.iec.edp.caf.commons.exception.ExceptionLevel; import io.iec.edp.caf.commons.transaction.JpaTransaction; import io.iec.edp.caf.commons.transaction.TransactionPropagation; +import io.iec.edp.caf.commons.utils.SpringBeanUtils; import io.iec.edp.caf.data.multilang.CAFMultiLanguageColumn; +import io.iec.edp.caf.i18n.api.LanguageSuffixProvider; import io.iec.edp.caf.tenancy.api.entity.AppInstanceInfo; import io.iec.edp.caf.tenancy.api.entity.EmbeddedTenant; import io.iec.edp.caf.tenancy.api.entity.Tenant; @@ -32,6 +35,7 @@ import io.iec.edp.caf.tenancy.core.utils.DataValidator; import lombok.var; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.persister.entity.PersistersContext; import java.util.*; @@ -85,6 +89,7 @@ public class TenantManager implements TenantPersistenceService { try { if (tenant == null) { + setLanguageFieldSuffix(language); var tmp = this.repository.findById(tenantId); if (tmp.isPresent()) { tenant = new Tenant(tmp.get(),language); @@ -124,6 +129,7 @@ public class TenantManager implements TenantPersistenceService { //若已缓存 if(allTenantsCache.containsKey(language)) return allTenantsCache.get(language); else{ + setLanguageFieldSuffix(language); List allEmbeddedTenants = this.repository.findAll(); List allTenants=new ArrayList<>(); if(allEmbeddedTenants!=null&&allEmbeddedTenants.size()>0){ @@ -144,6 +150,7 @@ public class TenantManager implements TenantPersistenceService { public Tenant getByCode(String tenantCode, String language) { DataValidator.checkForEmptyString(tenantCode, "tenantCode"); + setLanguageFieldSuffix(language); EmbeddedTenant embeddedTenant=this.repository.findByCode(tenantCode); Tenant tenant=null; if(embeddedTenant!=null){ @@ -166,6 +173,7 @@ public class TenantManager implements TenantPersistenceService { if (tenant != null) { + setLanguageFieldSuffix(language); saveEmbeddedTenant(tenant); this.addCache(tenant.getId(), language, tenant); } @@ -291,4 +299,17 @@ public class TenantManager implements TenantPersistenceService { tenantCache.remove(cacheKey); } + //设置语言后缀 TODO hibernate最终升级后删除 + @Deprecated + private void setLanguageFieldSuffix(String language) { + if (!TemporaryHibernateIdentifier.NATIVE) { + LanguageSuffixProvider suffixProvider = SpringBeanUtils.getBean(LanguageSuffixProvider.class); + String currentLangSuffix = suffixProvider.getFieldSuffix(language); + + String ctxLangSuffix = PersistersContext.getCurrentLangSuffix(); + if (!currentLangSuffix.equals(ctxLangSuffix)) + PersistersContext.setCurrentLangSuffix(currentLangSuffix); + } + } + } -- Gitee From 87551440f78c48aa6d45efa02987a23f79721e3a Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Thu, 18 Jul 2024 15:45:40 +0800 Subject: [PATCH 33/54] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E9=80=9A=E8=BF=87jackson=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multilang/CAFMultiLanguageColumn.java | 3 ++ .../CAFMultiLangEmbededTest.java | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java index 0dd535996..7fcc29cb8 100644 --- a/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java +++ b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java @@ -16,6 +16,7 @@ package io.iec.edp.caf.data.multilang; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.iec.edp.caf.data.CAFCurrentLanguageResolver; import lombok.Getter; import lombok.Setter; @@ -91,6 +92,7 @@ public class CAFMultiLanguageColumn { * @param i18nValues 多语Map <语言编号,对应值> */ @SuppressWarnings("unused") + @JsonIgnore public void setValues(Map i18nValues) { if (i18nValues != null) { i18nValues.forEach(this::setLanguageValue); @@ -101,6 +103,7 @@ public class CAFMultiLanguageColumn { * 返回多语Map <语言编号,对应值> */ @SuppressWarnings("JpaAttributeTypeInspection") + @JsonIgnore public Map getValues() { Map i18nValues = new HashMap<>(); if (cafMlcchs != null) i18nValues.put("zh-CHS", cafMlcchs); diff --git a/caf-data/caf-data-jpa/src/test/java/io/iec/edp/caf/data/multilangcolumn/CAFMultiLangEmbededTest.java b/caf-data/caf-data-jpa/src/test/java/io/iec/edp/caf/data/multilangcolumn/CAFMultiLangEmbededTest.java index 7311866c1..c2a1812b7 100644 --- a/caf-data/caf-data-jpa/src/test/java/io/iec/edp/caf/data/multilangcolumn/CAFMultiLangEmbededTest.java +++ b/caf-data/caf-data-jpa/src/test/java/io/iec/edp/caf/data/multilangcolumn/CAFMultiLangEmbededTest.java @@ -18,8 +18,10 @@ package io.iec.edp.caf.data.multilangcolumn; import io.iec.caf.data.jpa.repository.support.CafJpaLanguageThreadHolder; +import io.iec.edp.caf.common.JSONSerializer; import io.iec.edp.caf.commons.utils.SpringBeanUtils; import io.iec.edp.caf.data.multilang.CAFMultiLanguageColumn; +import lombok.Data; import org.hibernate.persister.entity.PersistersContext; import org.junit.Assert; import org.junit.Before; @@ -31,6 +33,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.test.context.junit4.SpringRunner; +import javax.persistence.Embedded; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaBuilder; @@ -309,4 +312,29 @@ public class CAFMultiLangEmbededTest { }); } + + @Test + public void testJacksonSerializer() { + //CAFMultiLanguageColumn 通过jackson序列化时，会把getValues方法序列化一个values属性，此方法需要在序列化时忽略 + MultiEntity entity = new MultiEntity(); + entity.setId("11"); + CAFMultiLanguageColumn column = new CAFMultiLanguageColumn(); + column.setCafMlcchs("你好"); + column.setCafMlcen("hello"); + entity.setName(column); + String jsonStr = JSONSerializer.serialize(entity); + Assert.assertTrue(!jsonStr.contains("values")); + MultiEntity entity1 = JSONSerializer.deserialize(jsonStr, MultiEntity.class); + } + + @Data + static class MultiEntity { + + private String id; + + @Embedded + private CAFMultiLanguageColumn name; + + } + } -- Gitee From 3dfd90267e651a82184c7e1465ebc4f37606a6f5 Mon Sep 17 00:00:00 2001 From: renxb Date: Fri, 19 Jul 2024 17:31:41 +0800 Subject: [PATCH 34/54] =?UTF-8?q?=E5=8D=87=E7=BA=A7netty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 118 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3fd0917ea..cb0f15a24 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ 1.33 4.10.0 2.14.1 - 4.1.94.Final + 4.1.108.Final 9.0.90 2.15.0 1.70 @@ -526,8 +526,124 @@ netty-transport ${netty.version} + - + + + + + + + + io.netty + netty-codec-mqtt + ${netty.version} + + + io.netty + netty-codec-redis + ${netty.version} + + + io.netty + netty-codec-smtp + ${netty.version} + + + io.netty + netty-codec-stomp + ${netty.version} + + + io.netty + netty-codec-xml + ${netty.version} + + + io.netty + netty-resolver-dns-classes-macos + ${netty.version} + + + io.netty + netty-transport-classes-epoll + ${netty.version} + + + io.netty + netty-transport-classes-kqueue + ${netty.version} + + + io.netty + netty-transport-native-unix-common + ${netty.version} + + + io.netty + netty-transport-rxtx + ${netty.version} + + + io.netty + netty-transport-sctp + ${netty.version} + + + io.netty + netty-transport-udt + ${netty.version} + + + io.netty + netty-codec-memcache + ${netty.version} + + + io.netty + netty-all + ${netty.version} + + + io.netty + netty-resolver-dns + ${netty.version} + + + io.netty + netty-handler + ${netty.version} + + + io.netty + netty-codec + ${netty.version} + + + io.netty + netty-resolver + ${netty.version} + + + io.netty + netty-buffer + ${netty.version} + + + io.netty + netty-handler-proxy + ${netty.version} + + + io.netty + netty-codec-socks + ${netty.version} + + + io.netty + netty-codec-http2 + ${netty.version} + org.springframework -- Gitee From 3467c1d2c39e4373a149fd600102d066759c958d Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Mon, 22 Jul 2024 18:45:26 +0800 Subject: [PATCH 35/54] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=8C=BA=E5=88=86=E4=BC=9A=E8=AF=9D=E7=BA=A7?= =?UTF-8?q?=E5=92=8C=E8=AF=B7=E6=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multilang/CAFContextLanguageResolver.java | 7 +++- .../caf/data/CAFCurrentLanguageResolver.java | 36 +++++++++++++++---- .../multilang/CAFMultiLanguageColumn.java | 6 ++-- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/context/data/multilang/CAFContextLanguageResolver.java b/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/context/data/multilang/CAFContextLanguageResolver.java index f2e4099b5..8476392e5 100644 --- a/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/context/data/multilang/CAFContextLanguageResolver.java +++ b/caf-context/caf-context-api/src/main/java/io/iec/edp/caf/context/data/multilang/CAFContextLanguageResolver.java @@ -28,10 +28,15 @@ import java.util.Optional; */ public class CAFContextLanguageResolver implements CAFCurrentLanguageResolver { + @Override + public Type getType() { + return Type.Session; + } + @Override public Optional getLanguage() { ICAFContextService service = SpringBeanUtils.getBean(ICAFContextService.class); - return Objects.nonNull(service) ? Optional.ofNullable(service.getLanguage()): Optional.empty(); + return Objects.nonNull(service) ? Optional.ofNullable(service.getLanguage()) : Optional.empty(); } } diff --git a/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/CAFCurrentLanguageResolver.java b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/CAFCurrentLanguageResolver.java index 42fc06cb8..e82ccd46b 100644 --- a/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/CAFCurrentLanguageResolver.java +++ b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/CAFCurrentLanguageResolver.java @@ -28,30 +28,54 @@ import java.util.ServiceLoader; */ public interface CAFCurrentLanguageResolver { + /** + * 获取当前的类型 + * + * @return 类型 + */ + Type getType(); + /** * 获取当前语言 */ Optional getLanguage(); - static CAFCurrentLanguageResolver getInstance() { - return CAFMultiLanguageResolverSelector.instance; + static CAFCurrentLanguageResolver getSessionInstance() { + return CAFMultiLanguageResolverSelector.sessionInstance; + } + + static CAFCurrentLanguageResolver getRequestInstance() { + return CAFMultiLanguageResolverSelector.requestInstance; } class CAFMultiLanguageResolverSelector { - private static CAFCurrentLanguageResolver instance = null; + //会话级别：Session > Request + private static CAFCurrentLanguageResolver sessionInstance = null; + //请求级别 + private static CAFCurrentLanguageResolver requestInstance = null; static { Logger log = LoggerFactory.getLogger(CAFCurrentLanguageResolver.class); ServiceLoader resolvers = ServiceLoader.load(CAFCurrentLanguageResolver.class); for (CAFCurrentLanguageResolver resolver : resolvers) { - instance = resolver; + if (resolver.getType() == Type.Session) { + sessionInstance = resolver; + } else if (resolver.getType() == Type.Request) { + requestInstance = resolver; + } } if (log.isDebugEnabled()) { - log.debug("current CAFCurrentLanguageResolver [{}]", instance.getClass().getName()); + log.debug("current CAFCurrentLanguageResolver of session [{}]", sessionInstance.getClass().getName()); + log.debug("current CAFCurrentLanguageResolver of request [{}]", requestInstance != null ? requestInstance.getClass().getName() : null); } - Assert.notNull(instance, "[CAFCurrentLanguageResolver] is null, please check."); + Assert.notNull(sessionInstance, "[CAFCurrentLanguageResolver] is null, please check."); } } + enum Type { + Session, + Request + } + } diff --git a/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java index 7fcc29cb8..45cf21902 100644 --- a/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java +++ b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java @@ -79,7 +79,8 @@ public class CAFMultiLanguageColumn { * @param value 多语值 */ public void setValue(String value) { - String langCode = CAFCurrentLanguageResolver.getInstance().getLanguage().orElseThrow(NullPointerException::new); + String langCode = CAFCurrentLanguageResolver.getSessionInstance().getLanguage() + .orElse(CAFCurrentLanguageResolver.getRequestInstance().getLanguage().orElseThrow(NullPointerException::new)); if (log.isDebugEnabled()) log.debug("Current language is {}, value is {}", langCode, value); @@ -120,7 +121,8 @@ public class CAFMultiLanguageColumn { */ @Override public String toString() { - String langCode = CAFCurrentLanguageResolver.getInstance().getLanguage().orElseThrow(NullPointerException::new); + String langCode = CAFCurrentLanguageResolver.getSessionInstance().getLanguage() + .orElse(CAFCurrentLanguageResolver.getRequestInstance().getLanguage().orElseThrow(NullPointerException::new)); if (log.isDebugEnabled()) log.debug("Current language is {}", langCode); -- Gitee From 052bb3e0e2074ca2b49ad44c122db3847babf9d3 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Tue, 23 Jul 2024 02:02:47 +0000 Subject: [PATCH 36/54] [maven-release-plugin] prepare release v1.6.3 --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa-i18n/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 136 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index e8b2d6e2a..7bbf5742e 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 3b0023e90..37a82e67d 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index be617c7ed..7cb197aa2 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index ca6fefe54..a5861cda4 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index d5f179ddf..7ad53310d 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index c9e2c44d2..b0fc78144 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index ccfec79b3..532a6c9a3 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 0c694d923..a052f4110 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index e7c0e1f93..2f2349166 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index a8cdaa195..f9342d20e 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 13a77e88f..a2bda2750 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index f0e309992..8dbdbb6e5 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 43cb94350..3f817f373 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 30d77419d..aa4e70da7 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-data/caf-data-jpa-i18n/pom.xml b/caf-data/caf-data-jpa-i18n/pom.xml index 171071232..8753c5ade 100644 --- a/caf-data/caf-data-jpa-i18n/pom.xml +++ b/caf-data/caf-data-jpa-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.3-SNAPSHOT + 1.6.3 caf-data-jpa-i18n diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 4ece45b7e..2be5ec7b1 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 2c891b4de..59472f929 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index adb668a1e..d8c3b8cbf 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 1f54b7bb0..deff3786b 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 83f5c5ba3..ebf9caad6 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 986aec229..ccbd321b9 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index f2abd208d..d5fbe7bb7 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 844eb5f11..d8605bad3 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.3-SNAPSHOT + 1.6.3 caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 9969ed416..4973d7928 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 80124f947..1d9eebcff 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index d1e6ac41b..e6e1f7a98 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index ad6475865..a922c2884 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 59ebca44e..9d5a35fbe 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.3 caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index dbef3d2e6..2de1ae5f7 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.3 caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 3065a68db..329b40807 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 38482a30f..460f4a959 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index de1b2ab69..d81051661 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 233d4b55a..c41f29753 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 15a833d5f..0cd43bf5b 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index e6c0e3c5a..7ef1e340c 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 80fa54b0f..b21c66814 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 2020cb1c4..8bc3f104b 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 1bbf6460b..378b423be 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 0cb6ece40..cb154b6fc 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.3-SNAPSHOT + 1.6.3 caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index aee68ba2c..500b209c7 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index c05a064a1..98a5fdd54 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 72da3b750..a13e707ec 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index fc4c00c4f..65167ccce 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 196a9f061..314abcac0 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 750e28f88..0735e6c38 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index a749d6ffe..154b2d8fb 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 85aef6039..ba61be7dc 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index b5924fb4e..202da0992 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index 44c9926d3..28da02e49 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index e13a5a506..2ce2ddd58 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 1435f992c..acae40ad5 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 8cc504224..c864d90b7 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 343def915..cb2e568db 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index f4f1abec6..12b67da7f 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index a5c6ccffa..b4f70e59a 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 6e7e713ee..9d2d9a3d6 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index ef79ae04e..5db320f3b 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index f0b932108..1188069d7 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index b0537c9d7..203a9b80f 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 5bc9c1154..07028dd39 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index a5e39e6f3..d69ba0c94 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 1e3a84e43..2f2b64adc 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 063e54ebb..6bd1c1d69 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 2f9ad1336..e9adf622d 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.3 caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 65cf2c27c..0bb5f095a 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.3 caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index e74c623f9..043d2aab0 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 2427b9707..994e3083b 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index b9b8750e6..1f3abe4c4 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index 0c093a0a5..a071a6482 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index e69e8305f..c32b5ba1c 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index 25d113e6f..d57166d5a 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3-SNAPSHOT + 1.6.3 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 7d222704f..2e8bb902b 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 caf-web diff --git a/pom.xml b/pom.xml index 3fd0917ea..def5f2dd6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.3-SNAPSHOT + 1.6.3 pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - HEAD + v1.6.3 @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-commons - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-commons-cryptography - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-commons-exception - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-commons-exception-diagnostic - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-commons-qrcode - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-commons-runtime - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-commons-serialization - 1.6.3-SNAPSHOT + 1.6.3 @@ -733,270 +733,270 @@ io.iec.edp caf-business-context-core - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-business-context-dist - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-business-context-memory - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-context-api - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-data-jdbc - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-data-jpa - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-data-jpa-i18n - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-event - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-i18n - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-i18n-api - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-i18n-runtime - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-lock-api - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-lock-memory - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-lock-redis - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-lock-extension-jpa - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-logging - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-msu-api - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-msu-client - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-msu-common - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-msu-server - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-multicontext - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-multicontext-support - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rest - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rest-api - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rest-client - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rest-server - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rpc - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rpc-api - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rpc-client - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rpc-registry-api - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rpc-registry-core - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rpc-registry-db - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rpc-remote-http - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rpc-server - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-rpc-remote-grpc - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-session - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-session-api - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-session-backend - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-session-core - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-session-web - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-tenancy - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-tenancy-api - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-tenancy-core - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-tenancy-repository-jpa - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-web - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-middleware - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-middleware-baolande - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-middleware-infrastructure - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-middleware-tomcat - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-middleware-tongweb - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-provider - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp @@ -1006,39 +1006,39 @@ io.iec.edp caf-session-provider - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-i18n-provider - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-security - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-security-api - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-model - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-model-api - 1.6.3-SNAPSHOT + 1.6.3 io.iec.edp caf-model-core - 1.6.3-SNAPSHOT + 1.6.3 -- Gitee From be09fe080a5c40e3b48e546f06ead64fcc0c4a3a Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Tue, 23 Jul 2024 02:02:47 +0000 Subject: [PATCH 37/54] [maven-release-plugin] prepare for next development iteration --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa-i18n/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 136 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index 7bbf5742e..d73918128 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 37a82e67d..6c0bbd123 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index 7cb197aa2..6b022976f 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index a5861cda4..4d5c44f11 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index 7ad53310d..e40a9718f 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index b0fc78144..cc0c3175a 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index 532a6c9a3..99815f607 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index a052f4110..09001c5f0 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index 2f2349166..cd3a7677e 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index f9342d20e..98a255120 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index a2bda2750..809d53a22 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 8dbdbb6e5..357e281b9 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 3f817f373..248a92b01 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index aa4e70da7..db773c3d9 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-data/caf-data-jpa-i18n/pom.xml b/caf-data/caf-data-jpa-i18n/pom.xml index 8753c5ade..d7fcca2d0 100644 --- a/caf-data/caf-data-jpa-i18n/pom.xml +++ b/caf-data/caf-data-jpa-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.3 + 1.6.4-SNAPSHOT caf-data-jpa-i18n diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 2be5ec7b1..00cf85a7f 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 59472f929..b7d193769 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index d8c3b8cbf..1c7ffdb22 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index deff3786b..31318bdfb 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index ebf9caad6..d8dde68ee 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index ccbd321b9..99ae87831 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index d5fbe7bb7..553081ec7 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index d8605bad3..57ead49f1 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.3 + 1.6.4-SNAPSHOT caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 4973d7928..8796f19c6 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 1d9eebcff..1bb195a25 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index e6e1f7a98..20ef4808d 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index a922c2884..b772a0cfc 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 9d5a35fbe..0f242ecfc 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3 + 1.6.4-SNAPSHOT caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index 2de1ae5f7..119825026 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.3 + 1.6.4-SNAPSHOT caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 329b40807..227a996ee 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 460f4a959..fb04f4aee 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index d81051661..76c669f78 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index c41f29753..0bbcf7b08 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 0cd43bf5b..3ad31a421 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index 7ef1e340c..bd0e32e3c 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index b21c66814..448986200 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 8bc3f104b..90a28f985 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 378b423be..338b9dd9f 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index cb154b6fc..cc5150084 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.3 + 1.6.4-SNAPSHOT caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index 500b209c7..13c0b7dc4 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index 98a5fdd54..3d3bc38a8 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index a13e707ec..3f9c5fd78 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index 65167ccce..01aace40a 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 314abcac0..e6935f06d 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 0735e6c38..a866905cb 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index 154b2d8fb..174129404 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index ba61be7dc..304f67305 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index 202da0992..444eea665 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index 28da02e49..a9234db78 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index 2ce2ddd58..d05f145df 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index acae40ad5..1fae3e1c2 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index c864d90b7..8bf796ba6 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index cb2e568db..ad58ef49e 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index 12b67da7f..1df705f5c 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index b4f70e59a..1370c5aeb 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 9d2d9a3d6..0dc858e96 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index 5db320f3b..ea741b596 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index 1188069d7..470b4abb4 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index 203a9b80f..51ec8c4ce 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 07028dd39..bbd368dbb 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index d69ba0c94..4407f800b 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 2f2b64adc..27fd9d0ed 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 6bd1c1d69..52da52a92 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index e9adf622d..e6b89780c 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3 + 1.6.4-SNAPSHOT caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 0bb5f095a..be848fc97 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.3 + 1.6.4-SNAPSHOT caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index 043d2aab0..d144b2f94 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 994e3083b..818d0a618 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index 1f3abe4c4..9239315fa 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index a071a6482..eb43da625 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index c32b5ba1c..2d8790d2b 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index d57166d5a..eb3186a0b 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.3 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 2e8bb902b..8382eccfb 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT caf-web diff --git a/pom.xml b/pom.xml index def5f2dd6..348d23589 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.3 + 1.6.4-SNAPSHOT pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - v1.6.3 + HEAD @@ -681,43 +681,43 @@ io.iec.edp caf-caching - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-commons - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-cryptography - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-exception - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-exception-diagnostic - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-qrcode - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-runtime - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-serialization - 1.6.3 + 1.6.4-SNAPSHOT @@ -733,270 +733,270 @@ io.iec.edp caf-business-context-core - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-business-context-dist - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-business-context-memory - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-context-api - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-data-jdbc - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-data-jpa - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-data-jpa-i18n - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-event - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-i18n - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-i18n-api - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-i18n-runtime - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-lock-api - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-lock-memory - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-lock-redis - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-lock-extension-jpa - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-logging - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-msu-api - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-msu-client - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-msu-common - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-msu-server - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-multicontext - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-multicontext-support - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rest - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rest-api - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rest-client - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rest-server - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-api - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-client - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-registry-api - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-registry-core - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-registry-db - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-remote-http - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-server - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-remote-grpc - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-session - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-session-api - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-session-backend - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-session-core - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-session-web - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-tenancy - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-tenancy-api - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-tenancy-core - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-tenancy-repository-jpa - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-web - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware-baolande - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware-infrastructure - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware-tomcat - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware-tongweb - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-provider - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp @@ -1006,39 +1006,39 @@ io.iec.edp caf-session-provider - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-i18n-provider - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-security - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-security-api - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-model - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-model-api - 1.6.3 + 1.6.4-SNAPSHOT io.iec.edp caf-model-core - 1.6.3 + 1.6.4-SNAPSHOT -- Gitee From 4141ea794dded0d95237742d175a4a3bc3b7d404 Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Tue, 23 Jul 2024 10:46:18 +0800 Subject: [PATCH 38/54] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java index 45cf21902..cebd14c0b 100644 --- a/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java +++ b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java @@ -80,7 +80,7 @@ public class CAFMultiLanguageColumn { */ public void setValue(String value) { String langCode = CAFCurrentLanguageResolver.getSessionInstance().getLanguage() - .orElse(CAFCurrentLanguageResolver.getRequestInstance().getLanguage().orElseThrow(NullPointerException::new)); + .orElseGet(() -> CAFCurrentLanguageResolver.getRequestInstance().getLanguage().orElseThrow(NullPointerException::new)); if (log.isDebugEnabled()) log.debug("Current language is {}, value is {}", langCode, value); @@ -122,7 +122,7 @@ public class CAFMultiLanguageColumn { @Override public String toString() { String langCode = CAFCurrentLanguageResolver.getSessionInstance().getLanguage() - .orElse(CAFCurrentLanguageResolver.getRequestInstance().getLanguage().orElseThrow(NullPointerException::new)); + .orElseGet(() -> CAFCurrentLanguageResolver.getRequestInstance().getLanguage().orElseThrow(NullPointerException::new)); if (log.isDebugEnabled()) log.debug("Current language is {}", langCode); -- Gitee From 52350d299a16ba6c7ddd45baf1d997a798d3bf79 Mon Sep 17 00:00:00 2001 From: Vincent Man Date: Tue, 23 Jul 2024 11:04:02 +0800 Subject: [PATCH 39/54] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../caf/data/multilang/CAFMultiLanguageColumn.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java index cebd14c0b..dc28bad43 100644 --- a/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java +++ b/caf-data/caf-data-jpa-i18n/src/main/java/io/iec/edp/caf/data/multilang/CAFMultiLanguageColumn.java @@ -80,7 +80,11 @@ public class CAFMultiLanguageColumn { */ public void setValue(String value) { String langCode = CAFCurrentLanguageResolver.getSessionInstance().getLanguage() - .orElseGet(() -> CAFCurrentLanguageResolver.getRequestInstance().getLanguage().orElseThrow(NullPointerException::new)); + .orElseGet(() -> { + if (CAFCurrentLanguageResolver.getRequestInstance() != null) + return CAFCurrentLanguageResolver.getRequestInstance().getLanguage().orElseThrow(NullPointerException::new); + else throw new NullPointerException(); + }); if (log.isDebugEnabled()) log.debug("Current language is {}, value is {}", langCode, value); @@ -122,7 +126,11 @@ public class CAFMultiLanguageColumn { @Override public String toString() { String langCode = CAFCurrentLanguageResolver.getSessionInstance().getLanguage() - .orElseGet(() -> CAFCurrentLanguageResolver.getRequestInstance().getLanguage().orElseThrow(NullPointerException::new)); + .orElseGet(() -> { + if (CAFCurrentLanguageResolver.getRequestInstance() != null) + return CAFCurrentLanguageResolver.getRequestInstance().getLanguage().orElseThrow(NullPointerException::new); + else throw new NullPointerException(); + }); if (log.isDebugEnabled()) log.debug("Current language is {}", langCode); -- Gitee From 5dac837a3bc56bd05c8d5ad1aee1347f4f9b5da9 Mon Sep 17 00:00:00 2001 From: renxb Date: Tue, 23 Jul 2024 11:05:58 +0800 Subject: [PATCH 40/54] =?UTF-8?q?=E5=8D=87=E7=BA=A7cxf,logback,hibernate-v?= =?UTF-8?q?alidator,jackson?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index cb0f15a24..2d84afd82 100644 --- a/pom.xml +++ b/pom.xml @@ -77,14 +77,14 @@ 1.8 1.8 1.7.22 - 3.5.5 + 3.5.8 1.5.21 32.0.1-jre 4.1.2 - 1.2.9 + 1.2.13 3.11.2 - 6.0.22.Final + 6.0.23.Final 3.2.0 1.7.1 5.3.10-SR4 @@ -104,7 +104,7 @@ 1.33 4.10.0 - 2.14.1 + 2.16.0 4.1.108.Final 9.0.90 2.15.0 -- Gitee From 1f1d07fc301bfa8cb2eca8048f1ab015f76506e0 Mon Sep 17 00:00:00 2001 From: yulongchao Date: Tue, 23 Jul 2024 15:15:49 +0800 Subject: [PATCH 41/54] 3rdupdate --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b76059905..b93399239 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 2.4.13 5.3.32 2.5.0.RELEASE - 5.5.8 + 5.8.11 2.2.12.RELEASE UTF-8 -- Gitee From 1b04f00edc7ca210df18bef800cb7c0c9e85fe3b Mon Sep 17 00:00:00 2001 From: yulongchao Date: Tue, 23 Jul 2024 16:38:18 +0800 Subject: [PATCH 42/54] 3rdupdate --- caf-commons/caf-commons-cryptography/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 4 ++-- pom.xml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 6c0bbd123..a782427c4 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -33,7 +33,7 @@ org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on commons-codec diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index 76c669f78..97104e152 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -86,11 +86,11 @@ org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on org.bouncycastle - bcprov-ext-jdk15on + bcprov-ext-jdk18on diff --git a/pom.xml b/pom.xml index b93399239..344022afe 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ 4.1.108.Final 9.0.90 2.15.0 - 1.70 + 1.78 1.13 3.3.0 2.1.1 @@ -279,17 +279,17 @@ org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on ${bouncycastle.version} org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on ${bouncycastle.version} org.bouncycastle - bcprov-ext-jdk15on + bcprov-ext-jdk18on ${bouncycastle.version} -- Gitee From 231a62a38a48ec30e9f46ecd0a35211e78ce48d1 Mon Sep 17 00:00:00 2001 From: renxb Date: Wed, 24 Jul 2024 17:18:23 +0800 Subject: [PATCH 43/54] =?UTF-8?q?=E5=8D=87=E7=BA=A7nacos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 344022afe..a159af992 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,8 @@ 42.5.5 8.2.2.jre8 2.0.4 - 0.2.6 + 0.2.12 + 1.1.12 19.3.0.0 20.2.0 @@ -237,6 +238,11 @@ nacos-discovery-spring-boot-starter ${nacos-discovery.version} + + com.alibaba.nacos + nacos-spring-context + ${nacos-spring-context.version} + org.projectlombok lombok -- Gitee From a226fde9013538117ad6c2c1b42aa491b06a8688 Mon Sep 17 00:00:00 2001 From: renxb Date: Wed, 24 Jul 2024 18:19:15 +0800 Subject: [PATCH 44/54] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a159af992..ffaa7cfc3 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ 8.2.2.jre8 2.0.4 0.2.12 - 1.1.12 + 1.1.2 19.3.0.0 20.2.0 -- Gitee From 313194995491d2d46cb19a1dc1d5e96eceae4aa8 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Thu, 25 Jul 2024 01:37:45 +0000 Subject: [PATCH 45/54] [maven-release-plugin] prepare release v1.6.4-rc.1 --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa-i18n/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 136 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index d73918128..28f806836 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index a782427c4..9cff88454 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index 6b022976f..00a4cef43 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index 4d5c44f11..df552f39f 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index e40a9718f..814e7c6e4 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index cc0c3175a..4f350f8d7 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index 99815f607..875774d5a 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 09001c5f0..282857f1e 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index cd3a7677e..be049c749 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index 98a255120..28e2b3161 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 809d53a22..2cbd438dc 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 357e281b9..a56312dff 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 248a92b01..c94f48b7b 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index db773c3d9..3815dbe5b 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-data/caf-data-jpa-i18n/pom.xml b/caf-data/caf-data-jpa-i18n/pom.xml index d7fcca2d0..5c1608706 100644 --- a/caf-data/caf-data-jpa-i18n/pom.xml +++ b/caf-data/caf-data-jpa-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-data-jpa-i18n diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 00cf85a7f..5038661bd 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-data/pom.xml b/caf-data/pom.xml index b7d193769..11dd9fe20 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index 1c7ffdb22..54ea0927b 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 31318bdfb..327133648 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index d8dde68ee..19b419831 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 99ae87831..e81811305 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index 553081ec7..b96b102e2 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 57ead49f1..0645c6a31 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 8796f19c6..587424071 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 1bb195a25..1dd1741f0 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index 20ef4808d..8176a4835 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index b772a0cfc..14635b805 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 0f242ecfc..835773037 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index 119825026..b237c6b48 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 227a996ee..7bf6bf5d5 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index fb04f4aee..eb0b89229 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index 97104e152..3b7529708 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 0bbcf7b08..bbe7ed509 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 3ad31a421..504f4f26e 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index bd0e32e3c..a88eb53fc 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 448986200..5e023fb83 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 90a28f985..8a7d9a302 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 338b9dd9f..8ce126389 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index cc5150084..b5bf64043 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index 13c0b7dc4..c27f19cf9 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index 3d3bc38a8..8f8d12b59 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 3f9c5fd78..157d48f66 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index 01aace40a..dd6641ba8 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index e6935f06d..2d071beca 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index a866905cb..9b11cbd0b 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index 174129404..e842b0625 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 304f67305..e431b91cf 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index 444eea665..78e577d58 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index a9234db78..f9484076d 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index d05f145df..84f59b12b 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 1fae3e1c2..cfa7e9bbc 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 8bf796ba6..1174cb745 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index ad58ef49e..5b7d03bc9 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index 1df705f5c..c8b6b4928 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index 1370c5aeb..0adf24068 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 0dc858e96..20dbdbe3d 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index ea741b596..2c3a3bddb 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index 470b4abb4..2a024a12b 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index 51ec8c4ce..e58b2d8c1 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index bbd368dbb..213afea3b 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index 4407f800b..b0fe2edca 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 27fd9d0ed..9967ab7a5 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 52da52a92..15b8d187b 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index e6b89780c..1d2672475 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index be848fc97..e8115f16c 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index d144b2f94..8c584cc21 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 818d0a618..74b5dbe5a 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index 9239315fa..d6b6ecb93 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index eb43da625..5ee1d384c 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index 2d8790d2b..d025e92df 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index eb3186a0b..cc03b683f 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.1 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 8382eccfb..3eb773010 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 caf-web diff --git a/pom.xml b/pom.xml index ffaa7cfc3..8f3cd771d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.1 pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - HEAD + v1.6.4-rc.1 @@ -803,43 +803,43 @@ io.iec.edp caf-caching - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-commons - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-commons-cryptography - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-commons-exception - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-commons-exception-diagnostic - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-commons-qrcode - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-commons-runtime - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-commons-serialization - 1.6.4-SNAPSHOT + 1.6.4-rc.1 @@ -855,270 +855,270 @@ io.iec.edp caf-business-context-core - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-business-context-dist - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-business-context-memory - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-context-api - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-data-jdbc - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-data-jpa - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-data-jpa-i18n - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-event - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-i18n - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-i18n-api - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-i18n-runtime - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-lock-api - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-lock-memory - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-lock-redis - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-lock-extension-jpa - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-logging - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-msu-api - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-msu-client - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-msu-common - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-msu-server - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-multicontext - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-multicontext-support - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rest - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rest-api - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rest-client - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rest-server - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rpc - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rpc-api - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rpc-client - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rpc-registry-api - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rpc-registry-core - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rpc-registry-db - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rpc-remote-http - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rpc-server - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-rpc-remote-grpc - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-session - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-session-api - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-session-backend - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-session-core - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-session-web - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-tenancy - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-tenancy-api - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-tenancy-core - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-tenancy-repository-jpa - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-web - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-middleware - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-middleware-baolande - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-middleware-infrastructure - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-middleware-tomcat - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-middleware-tongweb - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-provider - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp @@ -1128,39 +1128,39 @@ io.iec.edp caf-session-provider - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-i18n-provider - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-security - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-security-api - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-model - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-model-api - 1.6.4-SNAPSHOT + 1.6.4-rc.1 io.iec.edp caf-model-core - 1.6.4-SNAPSHOT + 1.6.4-rc.1 -- Gitee From 0b0e28a4056810834d54817bbffa5265786557c8 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Thu, 25 Jul 2024 01:37:46 +0000 Subject: [PATCH 46/54] [maven-release-plugin] prepare for next development iteration --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa-i18n/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 136 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index 28f806836..d73918128 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 9cff88454..a782427c4 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index 00a4cef43..6b022976f 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index df552f39f..4d5c44f11 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index 814e7c6e4..e40a9718f 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index 4f350f8d7..cc0c3175a 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index 875774d5a..99815f607 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 282857f1e..09001c5f0 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index be049c749..cd3a7677e 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index 28e2b3161..98a255120 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 2cbd438dc..809d53a22 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index a56312dff..357e281b9 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index c94f48b7b..248a92b01 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 3815dbe5b..db773c3d9 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-data/caf-data-jpa-i18n/pom.xml b/caf-data/caf-data-jpa-i18n/pom.xml index 5c1608706..d7fcca2d0 100644 --- a/caf-data/caf-data-jpa-i18n/pom.xml +++ b/caf-data/caf-data-jpa-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-data-jpa-i18n diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 5038661bd..00cf85a7f 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 11dd9fe20..b7d193769 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index 54ea0927b..1c7ffdb22 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 327133648..31318bdfb 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 19b419831..d8dde68ee 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index e81811305..99ae87831 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index b96b102e2..553081ec7 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 0645c6a31..57ead49f1 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 587424071..8796f19c6 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 1dd1741f0..1bb195a25 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index 8176a4835..20ef4808d 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index 14635b805..b772a0cfc 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 835773037..0f242ecfc 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index b237c6b48..119825026 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 7bf6bf5d5..227a996ee 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index eb0b89229..fb04f4aee 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index 3b7529708..97104e152 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index bbe7ed509..0bbcf7b08 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 504f4f26e..3ad31a421 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index a88eb53fc..bd0e32e3c 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 5e023fb83..448986200 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 8a7d9a302..90a28f985 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 8ce126389..338b9dd9f 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index b5bf64043..cc5150084 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index c27f19cf9..13c0b7dc4 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index 8f8d12b59..3d3bc38a8 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 157d48f66..3f9c5fd78 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index dd6641ba8..01aace40a 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 2d071beca..e6935f06d 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index 9b11cbd0b..a866905cb 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index e842b0625..174129404 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index e431b91cf..304f67305 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index 78e577d58..444eea665 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index f9484076d..a9234db78 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index 84f59b12b..d05f145df 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index cfa7e9bbc..1fae3e1c2 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 1174cb745..8bf796ba6 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index 5b7d03bc9..ad58ef49e 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index c8b6b4928..1df705f5c 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index 0adf24068..1370c5aeb 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 20dbdbe3d..0dc858e96 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index 2c3a3bddb..ea741b596 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index 2a024a12b..470b4abb4 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index e58b2d8c1..51ec8c4ce 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 213afea3b..bbd368dbb 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index b0fe2edca..4407f800b 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 9967ab7a5..27fd9d0ed 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 15b8d187b..52da52a92 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 1d2672475..e6b89780c 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index e8115f16c..be848fc97 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index 8c584cc21..d144b2f94 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 74b5dbe5a..818d0a618 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index d6b6ecb93..9239315fa 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index 5ee1d384c..eb43da625 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index d025e92df..2d8790d2b 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index cc03b683f..eb3186a0b 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-rc.1 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 3eb773010..8382eccfb 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT caf-web diff --git a/pom.xml b/pom.xml index 8f3cd771d..ffaa7cfc3 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.4-rc.1 + 1.6.4-SNAPSHOT pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - v1.6.4-rc.1 + HEAD @@ -803,43 +803,43 @@ io.iec.edp caf-caching - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-commons - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-cryptography - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-exception - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-exception-diagnostic - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-qrcode - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-runtime - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-serialization - 1.6.4-rc.1 + 1.6.4-SNAPSHOT @@ -855,270 +855,270 @@ io.iec.edp caf-business-context-core - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-business-context-dist - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-business-context-memory - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-context-api - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-data-jdbc - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-data-jpa - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-data-jpa-i18n - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-event - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-i18n - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-i18n-api - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-i18n-runtime - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-lock-api - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-lock-memory - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-lock-redis - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-lock-extension-jpa - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-logging - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-msu-api - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-msu-client - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-msu-common - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-msu-server - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-multicontext - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-multicontext-support - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rest - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rest-api - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rest-client - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rest-server - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-api - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-client - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-registry-api - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-registry-core - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-registry-db - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-remote-http - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-server - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-remote-grpc - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-session - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-session-api - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-session-backend - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-session-core - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-session-web - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-tenancy - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-tenancy-api - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-tenancy-core - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-tenancy-repository-jpa - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-web - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware-baolande - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware-infrastructure - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware-tomcat - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware-tongweb - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-provider - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp @@ -1128,39 +1128,39 @@ io.iec.edp caf-session-provider - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-i18n-provider - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-security - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-security-api - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-model - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-model-api - 1.6.4-rc.1 + 1.6.4-SNAPSHOT io.iec.edp caf-model-core - 1.6.4-rc.1 + 1.6.4-SNAPSHOT -- Gitee From e0f9eaa52487b9664ce73f1860dfb0d56ec8b0ee Mon Sep 17 00:00:00 2001 From: yulongchao Date: Fri, 26 Jul 2024 13:46:30 +0800 Subject: [PATCH 47/54] 3rdupdate --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ffaa7cfc3..00a7002cb 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 1.2.13 3.11.2 - 6.0.23.Final + 6.2.2.Final 3.2.0 1.7.1 5.3.10-SR4 -- Gitee From 043cf5ff6573282b63dae73cf3fecbe6b85433a3 Mon Sep 17 00:00:00 2001 From: yulongchao Date: Fri, 26 Jul 2024 14:15:42 +0800 Subject: [PATCH 48/54] 3rdupdate --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00a7002cb..89d9ad5b0 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 1.2.13 3.11.2 - 6.2.2.Final + 6.2.5.Final 3.2.0 1.7.1 5.3.10-SR4 -- Gitee From 163e220179e97b546523cd0ca326f41b362279f2 Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Fri, 26 Jul 2024 06:50:45 +0000 Subject: [PATCH 49/54] [maven-release-plugin] prepare release v1.6.4-rc.2 --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa-i18n/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 136 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index d73918128..b7618635f 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index a782427c4..10ff9e0af 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index 6b022976f..2c4d4812c 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index 4d5c44f11..35d8b196c 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index e40a9718f..eeb300bd3 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index cc0c3175a..98a13ffe3 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index 99815f607..6080d2fe2 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 09001c5f0..24167bba2 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index cd3a7677e..92f6e74e0 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index 98a255120..4cc1e9127 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index 809d53a22..dc3be9661 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 357e281b9..186d6a18c 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 248a92b01..6c92d7660 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index db773c3d9..86876eafc 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-data/caf-data-jpa-i18n/pom.xml b/caf-data/caf-data-jpa-i18n/pom.xml index d7fcca2d0..9929d7264 100644 --- a/caf-data/caf-data-jpa-i18n/pom.xml +++ b/caf-data/caf-data-jpa-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-data-jpa-i18n diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 00cf85a7f..1ed3209cd 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-data/pom.xml b/caf-data/pom.xml index b7d193769..62a3cb1f6 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index 1c7ffdb22..e63beab75 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 31318bdfb..9bc161d01 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index d8dde68ee..78ddc6906 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index 99ae87831..c229fc783 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index 553081ec7..7a5048c9f 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index 57ead49f1..fc9b4061e 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index 8796f19c6..dc8431936 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 1bb195a25..7d3af36d1 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index 20ef4808d..aae8892b9 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index b772a0cfc..f2f2f27fb 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 0f242ecfc..799ae95a2 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index 119825026..77db2f11e 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 227a996ee..1859f252f 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index fb04f4aee..647420236 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index 97104e152..152ed669f 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 0bbcf7b08..98c9e8195 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index 3ad31a421..f98925e0e 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index bd0e32e3c..3c0383d58 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 448986200..4b27a7df1 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index 90a28f985..b3f183109 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 338b9dd9f..7a0dd129d 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index cc5150084..190fc7a7c 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index 13c0b7dc4..496cd9bae 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index 3d3bc38a8..c1d870e22 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 3f9c5fd78..0587f2f99 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index 01aace40a..8283fec04 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index e6935f06d..05c542655 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index a866905cb..dd0524dba 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index 174129404..0e70a0be4 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index 304f67305..a42169e03 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index 444eea665..b9fd8be20 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index a9234db78..835078770 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index d05f145df..9c5f7eb4b 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 1fae3e1c2..44161ea7d 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 8bf796ba6..4834ac16e 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index ad58ef49e..e0c1ab490 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index 1df705f5c..9c8a81598 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index 1370c5aeb..39974c112 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 0dc858e96..61b67fba2 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index ea741b596..66c8d6874 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index 470b4abb4..e9c4357af 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index 51ec8c4ce..58c30591f 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index bbd368dbb..31ea06a31 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index 4407f800b..3b679dc75 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 27fd9d0ed..5871e895c 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 52da52a92..8b5dc91c8 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index e6b89780c..9e61a95e7 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index be848fc97..2da6fd9ba 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index d144b2f94..f020161b3 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index 818d0a618..ff365dbb0 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index 9239315fa..34697963c 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index eb43da625..0617a21aa 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index 2d8790d2b..3f639704e 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index eb3186a0b..7b986cafd 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-SNAPSHOT + 1.6.4-rc.2 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 8382eccfb..1b16d58b2 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 caf-web diff --git a/pom.xml b/pom.xml index 89d9ad5b0..fc2d065b4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.4-SNAPSHOT + 1.6.4-rc.2 pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - HEAD + v1.6.4-rc.2 @@ -803,43 +803,43 @@ io.iec.edp caf-caching - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-commons - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-commons-cryptography - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-commons-exception - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-commons-exception-diagnostic - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-commons-qrcode - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-commons-runtime - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-commons-serialization - 1.6.4-SNAPSHOT + 1.6.4-rc.2 @@ -855,270 +855,270 @@ io.iec.edp caf-business-context-core - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-business-context-dist - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-business-context-memory - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-context-api - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-data-jdbc - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-data-jpa - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-data-jpa-i18n - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-event - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-i18n - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-i18n-api - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-i18n-runtime - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-lock-api - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-lock-memory - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-lock-redis - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-lock-extension-jpa - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-logging - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-msu-api - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-msu-client - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-msu-common - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-msu-server - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-multicontext - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-multicontext-support - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rest - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rest-api - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rest-client - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rest-server - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rpc - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rpc-api - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rpc-client - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rpc-registry-api - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rpc-registry-core - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rpc-registry-db - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rpc-remote-http - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rpc-server - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-rpc-remote-grpc - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-session - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-session-api - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-session-backend - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-session-core - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-session-web - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-tenancy - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-tenancy-api - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-tenancy-core - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-tenancy-repository-jpa - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-web - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-middleware - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-middleware-baolande - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-middleware-infrastructure - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-middleware-tomcat - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-middleware-tongweb - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-provider - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp @@ -1128,39 +1128,39 @@ io.iec.edp caf-session-provider - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-i18n-provider - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-security - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-security-api - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-model - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-model-api - 1.6.4-SNAPSHOT + 1.6.4-rc.2 io.iec.edp caf-model-core - 1.6.4-SNAPSHOT + 1.6.4-rc.2 -- Gitee From b619b7ecaa8b2a690eb189e2f334444b2790177c Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Fri, 26 Jul 2024 06:50:46 +0000 Subject: [PATCH 50/54] [maven-release-plugin] prepare for next development iteration --- caf-caching/pom.xml | 2 +- caf-commons/caf-commons-cryptography/pom.xml | 2 +- .../caf-commons-exception-diagnostic/pom.xml | 2 +- caf-commons/caf-commons-exception/pom.xml | 2 +- caf-commons/caf-commons-qrcode/pom.xml | 2 +- caf-commons/caf-commons-runtime/pom.xml | 2 +- caf-commons/caf-commons-serialization/pom.xml | 2 +- caf-commons/pom.xml | 2 +- caf-context/caf-business-context-core/pom.xml | 2 +- caf-context/caf-business-context-dist/pom.xml | 2 +- .../caf-business-context-memory/pom.xml | 2 +- caf-context/caf-context-api/pom.xml | 2 +- caf-context/pom.xml | 2 +- caf-data/caf-data-jdbc/pom.xml | 2 +- caf-data/caf-data-jpa-i18n/pom.xml | 2 +- caf-data/caf-data-jpa/pom.xml | 2 +- caf-data/pom.xml | 2 +- caf-event/pom.xml | 2 +- caf-i18n/caf-i18n-api/pom.xml | 2 +- caf-i18n/caf-i18n-runtime/pom.xml | 2 +- caf-i18n/pom.xml | 2 +- caf-lock/caf-lock-api/pom.xml | 2 +- caf-lock/caf-lock-extension-jpa/pom.xml | 2 +- caf-lock/caf-lock-memory/pom.xml | 2 +- caf-lock/caf-lock-redis/pom.xml | 2 +- caf-lock/pom.xml | 2 +- caf-logging/pom.xml | 2 +- caf-model/caf-model-api/pom.xml | 2 +- caf-model/caf-model-core/pom.xml | 2 +- caf-model/pom.xml | 2 +- caf-msu/caf-msu-api/pom.xml | 2 +- caf-msu/caf-msu-client/pom.xml | 2 +- caf-msu/caf-msu-common/pom.xml | 2 +- caf-msu/caf-msu-server/pom.xml | 2 +- caf-msu/pom.xml | 2 +- caf-multicontext-support/pom.xml | 2 +- caf-multicontext/pom.xml | 2 +- caf-provider/caf-i18n-provider/pom.xml | 2 +- caf-provider/caf-lock-provider/pom.xml | 2 +- caf-provider/caf-session-provider/pom.xml | 2 +- caf-provider/pom.xml | 2 +- caf-rest/caf-rest-api/pom.xml | 2 +- caf-rest/caf-rest-client/pom.xml | 2 +- caf-rest/caf-rest-server/pom.xml | 2 +- caf-rest/pom.xml | 2 +- caf-rpc/caf-rpc-api/pom.xml | 2 +- caf-rpc/caf-rpc-client/pom.xml | 2 +- caf-rpc/caf-rpc-registry-api/pom.xml | 2 +- caf-rpc/caf-rpc-registry-core/pom.xml | 2 +- caf-rpc/caf-rpc-registry-db/pom.xml | 2 +- caf-rpc/caf-rpc-remote-grpc/pom.xml | 2 +- caf-rpc/caf-rpc-remote-http/pom.xml | 2 +- caf-rpc/caf-rpc-server/pom.xml | 2 +- caf-rpc/pom.xml | 2 +- caf-security/caf-security-api/pom.xml | 2 +- caf-security/pom.xml | 2 +- caf-session/caf-session-api/pom.xml | 2 +- caf-session/caf-session-backend/pom.xml | 2 +- caf-session/caf-session-core/pom.xml | 2 +- caf-session/caf-session-web/pom.xml | 2 +- caf-session/pom.xml | 2 +- caf-tenancy/caf-tenancy-api/pom.xml | 2 +- caf-tenancy/caf-tenancy-core/pom.xml | 2 +- .../caf-tenancy-repository-jpa/pom.xml | 2 +- .../caf-tenancy-repository-memory/pom.xml | 2 +- caf-tenancy/pom.xml | 2 +- caf-web/caf-middleware-baolande/pom.xml | 2 +- caf-web/caf-middleware-infrastructure/pom.xml | 2 +- caf-web/caf-middleware-tomcat/pom.xml | 2 +- caf-web/caf-middleware-tongweb/pom.xml | 2 +- caf-web/caf-middleware/pom.xml | 2 +- caf-web/pom.xml | 2 +- pom.xml | 136 +++++++++--------- 73 files changed, 140 insertions(+), 140 deletions(-) diff --git a/caf-caching/pom.xml b/caf-caching/pom.xml index b7618635f..d73918128 100644 --- a/caf-caching/pom.xml +++ b/caf-caching/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-caching diff --git a/caf-commons/caf-commons-cryptography/pom.xml b/caf-commons/caf-commons-cryptography/pom.xml index 10ff9e0af..a782427c4 100644 --- a/caf-commons/caf-commons-cryptography/pom.xml +++ b/caf-commons/caf-commons-cryptography/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception-diagnostic/pom.xml b/caf-commons/caf-commons-exception-diagnostic/pom.xml index 2c4d4812c..6b022976f 100644 --- a/caf-commons/caf-commons-exception-diagnostic/pom.xml +++ b/caf-commons/caf-commons-exception-diagnostic/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-exception/pom.xml b/caf-commons/caf-commons-exception/pom.xml index 35d8b196c..4d5c44f11 100644 --- a/caf-commons/caf-commons-exception/pom.xml +++ b/caf-commons/caf-commons-exception/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-qrcode/pom.xml b/caf-commons/caf-commons-qrcode/pom.xml index eeb300bd3..e40a9718f 100644 --- a/caf-commons/caf-commons-qrcode/pom.xml +++ b/caf-commons/caf-commons-qrcode/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-runtime/pom.xml b/caf-commons/caf-commons-runtime/pom.xml index 98a13ffe3..cc0c3175a 100644 --- a/caf-commons/caf-commons-runtime/pom.xml +++ b/caf-commons/caf-commons-runtime/pom.xml @@ -19,7 +19,7 @@ caf-commons io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-commons/caf-commons-serialization/pom.xml b/caf-commons/caf-commons-serialization/pom.xml index 6080d2fe2..99815f607 100644 --- a/caf-commons/caf-commons-serialization/pom.xml +++ b/caf-commons/caf-commons-serialization/pom.xml @@ -21,7 +21,7 @@ caf-commons io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-commons-serialization diff --git a/caf-commons/pom.xml b/caf-commons/pom.xml index 24167bba2..09001c5f0 100644 --- a/caf-commons/pom.xml +++ b/caf-commons/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-commons diff --git a/caf-context/caf-business-context-core/pom.xml b/caf-context/caf-business-context-core/pom.xml index 92f6e74e0..cd3a7677e 100644 --- a/caf-context/caf-business-context-core/pom.xml +++ b/caf-context/caf-business-context-core/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-dist/pom.xml b/caf-context/caf-business-context-dist/pom.xml index 4cc1e9127..98a255120 100644 --- a/caf-context/caf-business-context-dist/pom.xml +++ b/caf-context/caf-business-context-dist/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-business-context-memory/pom.xml b/caf-context/caf-business-context-memory/pom.xml index dc3be9661..809d53a22 100644 --- a/caf-context/caf-business-context-memory/pom.xml +++ b/caf-context/caf-business-context-memory/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-context/caf-context-api/pom.xml b/caf-context/caf-context-api/pom.xml index 186d6a18c..357e281b9 100644 --- a/caf-context/caf-context-api/pom.xml +++ b/caf-context/caf-context-api/pom.xml @@ -19,7 +19,7 @@ caf-context io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-context-api diff --git a/caf-context/pom.xml b/caf-context/pom.xml index 6c92d7660..248a92b01 100644 --- a/caf-context/pom.xml +++ b/caf-context/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-context diff --git a/caf-data/caf-data-jdbc/pom.xml b/caf-data/caf-data-jdbc/pom.xml index 86876eafc..db773c3d9 100644 --- a/caf-data/caf-data-jdbc/pom.xml +++ b/caf-data/caf-data-jdbc/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-data/caf-data-jpa-i18n/pom.xml b/caf-data/caf-data-jpa-i18n/pom.xml index 9929d7264..d7fcca2d0 100644 --- a/caf-data/caf-data-jpa-i18n/pom.xml +++ b/caf-data/caf-data-jpa-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-data - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-data-jpa-i18n diff --git a/caf-data/caf-data-jpa/pom.xml b/caf-data/caf-data-jpa/pom.xml index 1ed3209cd..00cf85a7f 100644 --- a/caf-data/caf-data-jpa/pom.xml +++ b/caf-data/caf-data-jpa/pom.xml @@ -19,7 +19,7 @@ caf-data io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-data/pom.xml b/caf-data/pom.xml index 62a3cb1f6..b7d193769 100644 --- a/caf-data/pom.xml +++ b/caf-data/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-data diff --git a/caf-event/pom.xml b/caf-event/pom.xml index e63beab75..1c7ffdb22 100644 --- a/caf-event/pom.xml +++ b/caf-event/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-event diff --git a/caf-i18n/caf-i18n-api/pom.xml b/caf-i18n/caf-i18n-api/pom.xml index 9bc161d01..31318bdfb 100644 --- a/caf-i18n/caf-i18n-api/pom.xml +++ b/caf-i18n/caf-i18n-api/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-i18n/caf-i18n-runtime/pom.xml b/caf-i18n/caf-i18n-runtime/pom.xml index 78ddc6906..d8dde68ee 100644 --- a/caf-i18n/caf-i18n-runtime/pom.xml +++ b/caf-i18n/caf-i18n-runtime/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-i18n - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-i18n/pom.xml b/caf-i18n/pom.xml index c229fc783..99ae87831 100644 --- a/caf-i18n/pom.xml +++ b/caf-i18n/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-i18n diff --git a/caf-lock/caf-lock-api/pom.xml b/caf-lock/caf-lock-api/pom.xml index 7a5048c9f..553081ec7 100644 --- a/caf-lock/caf-lock-api/pom.xml +++ b/caf-lock/caf-lock-api/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-extension-jpa/pom.xml b/caf-lock/caf-lock-extension-jpa/pom.xml index fc9b4061e..57ead49f1 100644 --- a/caf-lock/caf-lock-extension-jpa/pom.xml +++ b/caf-lock/caf-lock-extension-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-lock - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-lock-extension-jpa caf-lock-extension-jpa diff --git a/caf-lock/caf-lock-memory/pom.xml b/caf-lock/caf-lock-memory/pom.xml index dc8431936..8796f19c6 100644 --- a/caf-lock/caf-lock-memory/pom.xml +++ b/caf-lock/caf-lock-memory/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-lock/caf-lock-redis/pom.xml b/caf-lock/caf-lock-redis/pom.xml index 7d3af36d1..1bb195a25 100644 --- a/caf-lock/caf-lock-redis/pom.xml +++ b/caf-lock/caf-lock-redis/pom.xml @@ -20,7 +20,7 @@ caf-lock io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-lock/pom.xml b/caf-lock/pom.xml index aae8892b9..20ef4808d 100644 --- a/caf-lock/pom.xml +++ b/caf-lock/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-lock diff --git a/caf-logging/pom.xml b/caf-logging/pom.xml index f2f2f27fb..b772a0cfc 100644 --- a/caf-logging/pom.xml +++ b/caf-logging/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-logging diff --git a/caf-model/caf-model-api/pom.xml b/caf-model/caf-model-api/pom.xml index 799ae95a2..0f242ecfc 100644 --- a/caf-model/caf-model-api/pom.xml +++ b/caf-model/caf-model-api/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-model-api diff --git a/caf-model/caf-model-core/pom.xml b/caf-model/caf-model-core/pom.xml index 77db2f11e..119825026 100644 --- a/caf-model/caf-model-core/pom.xml +++ b/caf-model/caf-model-core/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-model - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-model-core diff --git a/caf-model/pom.xml b/caf-model/pom.xml index 1859f252f..227a996ee 100644 --- a/caf-model/pom.xml +++ b/caf-model/pom.xml @@ -20,7 +20,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-model diff --git a/caf-msu/caf-msu-api/pom.xml b/caf-msu/caf-msu-api/pom.xml index 647420236..fb04f4aee 100644 --- a/caf-msu/caf-msu-api/pom.xml +++ b/caf-msu/caf-msu-api/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-client/pom.xml b/caf-msu/caf-msu-client/pom.xml index 152ed669f..97104e152 100644 --- a/caf-msu/caf-msu-client/pom.xml +++ b/caf-msu/caf-msu-client/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-common/pom.xml b/caf-msu/caf-msu-common/pom.xml index 98c9e8195..0bbcf7b08 100644 --- a/caf-msu/caf-msu-common/pom.xml +++ b/caf-msu/caf-msu-common/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-msu/caf-msu-server/pom.xml b/caf-msu/caf-msu-server/pom.xml index f98925e0e..3ad31a421 100644 --- a/caf-msu/caf-msu-server/pom.xml +++ b/caf-msu/caf-msu-server/pom.xml @@ -19,7 +19,7 @@ caf-msu io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-msu/pom.xml b/caf-msu/pom.xml index 3c0383d58..bd0e32e3c 100644 --- a/caf-msu/pom.xml +++ b/caf-msu/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-msu diff --git a/caf-multicontext-support/pom.xml b/caf-multicontext-support/pom.xml index 4b27a7df1..448986200 100644 --- a/caf-multicontext-support/pom.xml +++ b/caf-multicontext-support/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-multicontext/pom.xml b/caf-multicontext/pom.xml index b3f183109..90a28f985 100644 --- a/caf-multicontext/pom.xml +++ b/caf-multicontext/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-provider/caf-i18n-provider/pom.xml b/caf-provider/caf-i18n-provider/pom.xml index 7a0dd129d..338b9dd9f 100644 --- a/caf-provider/caf-i18n-provider/pom.xml +++ b/caf-provider/caf-i18n-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/caf-lock-provider/pom.xml b/caf-provider/caf-lock-provider/pom.xml index 190fc7a7c..cc5150084 100644 --- a/caf-provider/caf-lock-provider/pom.xml +++ b/caf-provider/caf-lock-provider/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-provider - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-lock-provider caf-lock-provider diff --git a/caf-provider/caf-session-provider/pom.xml b/caf-provider/caf-session-provider/pom.xml index 496cd9bae..13c0b7dc4 100644 --- a/caf-provider/caf-session-provider/pom.xml +++ b/caf-provider/caf-session-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/caf-provider/pom.xml b/caf-provider/pom.xml index c1d870e22..3d3bc38a8 100644 --- a/caf-provider/pom.xml +++ b/caf-provider/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-api/pom.xml b/caf-rest/caf-rest-api/pom.xml index 0587f2f99..3f9c5fd78 100644 --- a/caf-rest/caf-rest-api/pom.xml +++ b/caf-rest/caf-rest-api/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-client/pom.xml b/caf-rest/caf-rest-client/pom.xml index 8283fec04..01aace40a 100644 --- a/caf-rest/caf-rest-client/pom.xml +++ b/caf-rest/caf-rest-client/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rest/caf-rest-server/pom.xml b/caf-rest/caf-rest-server/pom.xml index 05c542655..e6935f06d 100644 --- a/caf-rest/caf-rest-server/pom.xml +++ b/caf-rest/caf-rest-server/pom.xml @@ -19,7 +19,7 @@ caf-rest io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rest/pom.xml b/caf-rest/pom.xml index dd0524dba..a866905cb 100644 --- a/caf-rest/pom.xml +++ b/caf-rest/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-rest diff --git a/caf-rpc/caf-rpc-api/pom.xml b/caf-rpc/caf-rpc-api/pom.xml index 0e70a0be4..174129404 100644 --- a/caf-rpc/caf-rpc-api/pom.xml +++ b/caf-rpc/caf-rpc-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-client/pom.xml b/caf-rpc/caf-rpc-client/pom.xml index a42169e03..304f67305 100644 --- a/caf-rpc/caf-rpc-client/pom.xml +++ b/caf-rpc/caf-rpc-client/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-api/pom.xml b/caf-rpc/caf-rpc-registry-api/pom.xml index b9fd8be20..444eea665 100644 --- a/caf-rpc/caf-rpc-registry-api/pom.xml +++ b/caf-rpc/caf-rpc-registry-api/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-core/pom.xml b/caf-rpc/caf-rpc-registry-core/pom.xml index 835078770..a9234db78 100644 --- a/caf-rpc/caf-rpc-registry-core/pom.xml +++ b/caf-rpc/caf-rpc-registry-core/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-registry-db/pom.xml b/caf-rpc/caf-rpc-registry-db/pom.xml index 9c5f7eb4b..d05f145df 100644 --- a/caf-rpc/caf-rpc-registry-db/pom.xml +++ b/caf-rpc/caf-rpc-registry-db/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-grpc/pom.xml b/caf-rpc/caf-rpc-remote-grpc/pom.xml index 44161ea7d..1fae3e1c2 100644 --- a/caf-rpc/caf-rpc-remote-grpc/pom.xml +++ b/caf-rpc/caf-rpc-remote-grpc/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-remote-http/pom.xml b/caf-rpc/caf-rpc-remote-http/pom.xml index 4834ac16e..8bf796ba6 100644 --- a/caf-rpc/caf-rpc-remote-http/pom.xml +++ b/caf-rpc/caf-rpc-remote-http/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/caf-rpc-server/pom.xml b/caf-rpc/caf-rpc-server/pom.xml index e0c1ab490..ad58ef49e 100644 --- a/caf-rpc/caf-rpc-server/pom.xml +++ b/caf-rpc/caf-rpc-server/pom.xml @@ -19,7 +19,7 @@ caf-rpc io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-rpc/pom.xml b/caf-rpc/pom.xml index 9c8a81598..1df705f5c 100644 --- a/caf-rpc/pom.xml +++ b/caf-rpc/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-rpc diff --git a/caf-security/caf-security-api/pom.xml b/caf-security/caf-security-api/pom.xml index 39974c112..1370c5aeb 100644 --- a/caf-security/caf-security-api/pom.xml +++ b/caf-security/caf-security-api/pom.xml @@ -19,7 +19,7 @@ caf-security io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-security/pom.xml b/caf-security/pom.xml index 61b67fba2..0dc858e96 100644 --- a/caf-security/pom.xml +++ b/caf-security/pom.xml @@ -19,7 +19,7 @@ caf-framework io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 pom diff --git a/caf-session/caf-session-api/pom.xml b/caf-session/caf-session-api/pom.xml index 66c8d6874..ea741b596 100644 --- a/caf-session/caf-session-api/pom.xml +++ b/caf-session/caf-session-api/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-backend/pom.xml b/caf-session/caf-session-backend/pom.xml index e9c4357af..470b4abb4 100644 --- a/caf-session/caf-session-backend/pom.xml +++ b/caf-session/caf-session-backend/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-core/pom.xml b/caf-session/caf-session-core/pom.xml index 58c30591f..51ec8c4ce 100644 --- a/caf-session/caf-session-core/pom.xml +++ b/caf-session/caf-session-core/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-session/caf-session-web/pom.xml b/caf-session/caf-session-web/pom.xml index 31ea06a31..bbd368dbb 100644 --- a/caf-session/caf-session-web/pom.xml +++ b/caf-session/caf-session-web/pom.xml @@ -19,7 +19,7 @@ caf-session io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-session/pom.xml b/caf-session/pom.xml index 3b679dc75..4407f800b 100644 --- a/caf-session/pom.xml +++ b/caf-session/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-session diff --git a/caf-tenancy/caf-tenancy-api/pom.xml b/caf-tenancy/caf-tenancy-api/pom.xml index 5871e895c..27fd9d0ed 100644 --- a/caf-tenancy/caf-tenancy-api/pom.xml +++ b/caf-tenancy/caf-tenancy-api/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-core/pom.xml b/caf-tenancy/caf-tenancy-core/pom.xml index 8b5dc91c8..52da52a92 100644 --- a/caf-tenancy/caf-tenancy-core/pom.xml +++ b/caf-tenancy/caf-tenancy-core/pom.xml @@ -19,7 +19,7 @@ caf-tenancy io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml index 9e61a95e7..e6b89780c 100644 --- a/caf-tenancy/caf-tenancy-repository-jpa/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-jpa/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-tenancy-repository-jpa caf-tenancy-repository-jpa diff --git a/caf-tenancy/caf-tenancy-repository-memory/pom.xml b/caf-tenancy/caf-tenancy-repository-memory/pom.xml index 2da6fd9ba..be848fc97 100644 --- a/caf-tenancy/caf-tenancy-repository-memory/pom.xml +++ b/caf-tenancy/caf-tenancy-repository-memory/pom.xml @@ -19,7 +19,7 @@ io.iec.edp caf-tenancy - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-tenancy-repository-memory caf-tenancy-repository-memory diff --git a/caf-tenancy/pom.xml b/caf-tenancy/pom.xml index f020161b3..d144b2f94 100644 --- a/caf-tenancy/pom.xml +++ b/caf-tenancy/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-tenancy diff --git a/caf-web/caf-middleware-baolande/pom.xml b/caf-web/caf-middleware-baolande/pom.xml index ff365dbb0..818d0a618 100644 --- a/caf-web/caf-middleware-baolande/pom.xml +++ b/caf-web/caf-middleware-baolande/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-infrastructure/pom.xml b/caf-web/caf-middleware-infrastructure/pom.xml index 34697963c..9239315fa 100644 --- a/caf-web/caf-middleware-infrastructure/pom.xml +++ b/caf-web/caf-middleware-infrastructure/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tomcat/pom.xml b/caf-web/caf-middleware-tomcat/pom.xml index 0617a21aa..eb43da625 100644 --- a/caf-web/caf-middleware-tomcat/pom.xml +++ b/caf-web/caf-middleware-tomcat/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware-tongweb/pom.xml b/caf-web/caf-middleware-tongweb/pom.xml index 3f639704e..2d8790d2b 100644 --- a/caf-web/caf-middleware-tongweb/pom.xml +++ b/caf-web/caf-middleware-tongweb/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/caf-middleware/pom.xml b/caf-web/caf-middleware/pom.xml index 7b986cafd..eb3186a0b 100644 --- a/caf-web/caf-middleware/pom.xml +++ b/caf-web/caf-middleware/pom.xml @@ -19,7 +19,7 @@ caf-web io.iec.edp - 1.6.4-rc.2 + 1.6.4-SNAPSHOT 4.0.0 diff --git a/caf-web/pom.xml b/caf-web/pom.xml index 1b16d58b2..8382eccfb 100644 --- a/caf-web/pom.xml +++ b/caf-web/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT caf-web diff --git a/pom.xml b/pom.xml index fc2d065b4..89d9ad5b0 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ io.iec.edp caf-framework - 1.6.4-rc.2 + 1.6.4-SNAPSHOT pom @@ -61,7 +61,7 @@ scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git scm:git:ssh://git@git.iec.io:6060/caf-next/caf-framework.git https://git.iec.io/caf-next/caf-framework - v1.6.4-rc.2 + HEAD @@ -803,43 +803,43 @@ io.iec.edp caf-caching - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-commons - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-cryptography - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-exception - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-exception-diagnostic - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-qrcode - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-runtime - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-commons-serialization - 1.6.4-rc.2 + 1.6.4-SNAPSHOT @@ -855,270 +855,270 @@ io.iec.edp caf-business-context-core - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-business-context-dist - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-business-context-memory - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-context-api - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-data-jdbc - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-data-jpa - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-data-jpa-i18n - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-event - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-i18n - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-i18n-api - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-i18n-runtime - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-lock-api - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-lock-memory - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-lock-redis - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-lock-extension-jpa - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-logging - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-msu-api - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-msu-client - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-msu-common - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-msu-server - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-multicontext - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-multicontext-support - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rest - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rest-api - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rest-client - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rest-server - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-api - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-client - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-registry-api - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-registry-core - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-registry-db - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-remote-http - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-server - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-rpc-remote-grpc - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-session - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-session-api - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-session-backend - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-session-core - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-session-web - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-tenancy - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-tenancy-api - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-tenancy-core - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-tenancy-repository-jpa - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-web - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware-baolande - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware-infrastructure - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware-tomcat - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-middleware-tongweb - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-provider - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp @@ -1128,39 +1128,39 @@ io.iec.edp caf-session-provider - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-i18n-provider - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-security - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-security-api - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-model - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-model-api - 1.6.4-rc.2 + 1.6.4-SNAPSHOT io.iec.edp caf-model-core - 1.6.4-rc.2 + 1.6.4-SNAPSHOT -- Gitee From beefc3460556575334f8b65ba6b8340fb5006981 Mon Sep 17 00:00:00 2001 From: yulongchao Date: Wed, 4 Sep 2024 15:29:32 +0800 Subject: [PATCH 51/54] jsonconfig --- .../java/io/iec/edp/caf/common/JSONUtils.java | 66 +++++++++++++++++++ .../io/iec/edp/caf/commons/JacksonUtils.java | 66 +++++++++++++++++++ .../config/JsonConfigurationProperties.java | 21 ++++++ .../io/iec/caf/commons/config/JsonConfig.java | 5 ++ .../io/iec/caf/commons/json/JsonTest.java | 16 +++++ .../src/test/resources/application.yaml | 10 ++- 6 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/core/config/JsonConfigurationProperties.java diff --git a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/common/JSONUtils.java b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/common/JSONUtils.java index 296967f39..3c068630e 100644 --- a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/common/JSONUtils.java +++ b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/common/JSONUtils.java @@ -20,10 +20,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.StreamReadConstraints; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import io.iec.edp.caf.commons.core.config.JsonConfigurationProperties; +import io.iec.edp.caf.commons.utils.SpringBeanUtils; import lombok.extern.slf4j.Slf4j; import java.io.IOException; @@ -45,6 +48,13 @@ import java.time.format.DateTimeFormatter; private static final String STANDARD_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";//"yyyy-MM-dd HH:mm:ss"; private static final String STANDARD_FORMAT2 = "yyyy-MM-dd'T'HH:mm:ss.SSS a"; + private static JsonConfigurationProperties jsonConfig = SpringBeanUtils.getBean(JsonConfigurationProperties.class); + private static final int MAX_STRING_LEN = convertStringToInt(jsonConfig.getMaxStringLength()); + private static final int MAX_NESTING_DEPTH = convertStringToInt(jsonConfig.getMaxNestingDepth()); + private static final int MAX_NUM_LEN = convertStringToInt(jsonConfig.getMaxNumLength()); + private static final int MAX_NAME_LEN = convertStringToInt(jsonConfig.getMaxNameLength()); + private static final long MAX_DOC_LEN = convertStringToLong(jsonConfig.getMaxDocLength()); + static { //对象的所有字段全部列入 objectMapper.setSerializationInclusion(JsonInclude.Include.ALWAYS); @@ -76,6 +86,13 @@ import java.time.format.DateTimeFormatter; LocalDateTimeDeserializer deserializer = new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(STANDARD_FORMAT2)); module.addDeserializer(LocalDateTime.class, deserializer); objectMapper.registerModule(module); + + objectMapper.getFactory().setStreamReadConstraints(StreamReadConstraints.builder().maxStringLength(MAX_STRING_LEN) + .maxNestingDepth(MAX_NESTING_DEPTH) + .maxNumberLength(MAX_NUM_LEN) + .maxNameLength(MAX_NAME_LEN) + .maxDocumentLength(MAX_DOC_LEN) + .build()); } /** @@ -182,4 +199,53 @@ import java.time.format.DateTimeFormatter; public static ObjectMapper getObjectMapper(){ return objectMapper; } + + private static int convertStringToInt(String input) { + // 检查输入是否为空或非法 + if (input == null || input.isEmpty()) { + throw new IllegalArgumentException("Input cannot be null or empty."); + } + + // 用于存储数字和单位 + int number = 0; + char unit = 'N'; // 默认为无单位 + + // 遍历字符串中的每个字符 + for (int i = 0; i < input.length(); i++) { + char c = input.charAt(i); + // 如果是数字，则转换并累加到number上 + if (Character.isDigit(c)) { + number = number * 10 + (c - '0'); + } + // 如果是非数字字符，则认为是单位 + else { + unit = c; + break; // 只取第一个非数字字符作为单位 + } + } + + // 根据单位转换为整数 + switch (unit) { + case 'K': + return number * 1000; + case 'M': + return number * 1000000; + default: + return number; // 无单位直接返回 + } + } + + private static long convertStringToLong(String input) { + if (input == null || input.isEmpty()) { + throw new IllegalArgumentException("Input cannot be null or empty."); + } + long num = -1L; + if(input.contains("L")) + num = Long.parseLong(input.substring(0,input.length()-1)); + else + num = Long.parseLong(input); + + return num; + + } } diff --git a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java index 11900cc69..25dd32f23 100644 --- a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java +++ b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java @@ -20,9 +20,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.StreamReadConstraints; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import io.iec.edp.caf.commons.core.config.JsonConfigurationProperties; +import io.iec.edp.caf.commons.utils.SpringBeanUtils; import lombok.extern.slf4j.Slf4j; import java.io.IOException; @@ -41,6 +44,13 @@ class JacksonUtils { private static final String STANDARD_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";//"yyyy-MM-dd HH:mm:ss"; private static final String STANDARD_FORMAT2 = "yyyy-MM-dd'T'HH:mm:ss.SSS a"; + private static JsonConfigurationProperties jsonConfig = SpringBeanUtils.getBean(JsonConfigurationProperties.class); + private static final int MAX_STRING_LEN = convertStringToInt(jsonConfig.getMaxStringLength()); + private static final int MAX_NESTING_DEPTH = convertStringToInt(jsonConfig.getMaxNestingDepth()); + private static final int MAX_NUM_LEN = convertStringToInt(jsonConfig.getMaxNumLength()); + private static final int MAX_NAME_LEN = convertStringToInt(jsonConfig.getMaxNameLength()); + private static final long MAX_DOC_LEN = convertStringToLong(jsonConfig.getMaxDocLength()); + static { //对象的所有字段全部列入 objectMapper.setSerializationInclusion(JsonInclude.Include.ALWAYS); @@ -72,6 +82,13 @@ class JacksonUtils { LocalDateTimeDeserializer deserializer = new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(STANDARD_FORMAT2)); module.addDeserializer(LocalDateTime.class, deserializer); objectMapper.registerModule(module); + + objectMapper.getFactory().setStreamReadConstraints(StreamReadConstraints.builder().maxStringLength(MAX_STRING_LEN) + .maxNestingDepth(MAX_NESTING_DEPTH) + .maxNumberLength(MAX_NUM_LEN) + .maxNameLength(MAX_NAME_LEN) + .maxDocumentLength(MAX_DOC_LEN) + .build()); } /** @@ -224,4 +241,53 @@ class JacksonUtils { public static ObjectMapper getObjectMapper(){ return objectMapper; } + + private static int convertStringToInt(String input) { + // 检查输入是否为空或非法 + if (input == null || input.isEmpty()) { + throw new IllegalArgumentException("Input cannot be null or empty."); + } + + // 用于存储数字和单位 + int number = 0; + char unit = 'N'; // 默认为无单位 + + // 遍历字符串中的每个字符 + for (int i = 0; i < input.length(); i++) { + char c = input.charAt(i); + // 如果是数字，则转换并累加到number上 + if (Character.isDigit(c)) { + number = number * 10 + (c - '0'); + } + // 如果是非数字字符，则认为是单位 + else { + unit = c; + break; // 只取第一个非数字字符作为单位 + } + } + + // 根据单位转换为整数 + switch (unit) { + case 'K': + return number * 1000; + case 'M': + return number * 1000000; + default: + return number; // 无单位直接返回 + } + } + + private static long convertStringToLong(String input) { + if (input == null || input.isEmpty()) { + throw new IllegalArgumentException("Input cannot be null or empty."); + } + long num = -1L; + if(input.contains("L")) + num = Long.parseLong(input.substring(0,input.length()-1)); + else + num = Long.parseLong(input); + + return num; + + } } diff --git a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/core/config/JsonConfigurationProperties.java b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/core/config/JsonConfigurationProperties.java new file mode 100644 index 000000000..12895c035 --- /dev/null +++ b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/core/config/JsonConfigurationProperties.java @@ -0,0 +1,21 @@ +package io.iec.edp.caf.commons.core.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + + +@Data +@ConfigurationProperties("caf-boot.serialization.json") +public class JsonConfigurationProperties { + + private String maxStringLength; + + private String maxNestingDepth; + + private String maxNumLength; + + private String maxNameLength; + + private String maxDocLength; + +} diff --git a/caf-commons/caf-commons-serialization/src/test/java/io/iec/caf/commons/config/JsonConfig.java b/caf-commons/caf-commons-serialization/src/test/java/io/iec/caf/commons/config/JsonConfig.java index 28e9e2ac3..c2b048e14 100644 --- a/caf-commons/caf-commons-serialization/src/test/java/io/iec/caf/commons/config/JsonConfig.java +++ b/caf-commons/caf-commons-serialization/src/test/java/io/iec/caf/commons/config/JsonConfig.java @@ -18,9 +18,11 @@ package io.iec.caf.commons.config; import io.iec.edp.caf.commons.core.SerializerFactory; import io.iec.edp.caf.commons.core.api.CafSerialization; +import io.iec.edp.caf.commons.core.config.JsonConfigurationProperties; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -32,6 +34,9 @@ import java.util.ServiceLoader; @EnableAutoConfiguration @ComponentScan({"io.iec.edp.caf.commons"}) @EntityScan({"io.iec.edp.caf.commons"}) +@EnableConfigurationProperties({ + JsonConfigurationProperties.class +}) public class JsonConfig extends SerializerFactory { static { ServiceLoader operations = ServiceLoader.load(CafSerialization.class); diff --git a/caf-commons/caf-commons-serialization/src/test/java/io/iec/caf/commons/json/JsonTest.java b/caf-commons/caf-commons-serialization/src/test/java/io/iec/caf/commons/json/JsonTest.java index f4c6293e3..619639d9e 100644 --- a/caf-commons/caf-commons-serialization/src/test/java/io/iec/caf/commons/json/JsonTest.java +++ b/caf-commons/caf-commons-serialization/src/test/java/io/iec/caf/commons/json/JsonTest.java @@ -18,11 +18,17 @@ package io.iec.caf.commons.json; import io.iec.caf.commons.config.JsonConfig; import io.iec.edp.caf.commons.core.SerializerFactory; +import io.iec.edp.caf.commons.core.config.JsonConfigurationProperties; import io.iec.edp.caf.commons.core.enums.SerializeType; +import io.iec.edp.caf.commons.utils.SpringBeanUtils; +import lombok.SneakyThrows; import lombok.var; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationContext; import org.springframework.test.context.junit4.SpringRunner; import java.io.ByteArrayInputStream; @@ -38,6 +44,15 @@ import java.util.Map; @RunWith(SpringRunner.class) @SpringBootTest(classes = JsonConfig.class) public class JsonTest { + + @Autowired + private ApplicationContext applicationContext; + + @SneakyThrows + @Before + public void init() throws IOException { + SpringBeanUtils.setApplicationContext(applicationContext); + } @Test public void testNormalEntity() throws IllegalAccessException, ClassNotFoundException, InstantiationException, IOException { var s = "cs"; @@ -215,4 +230,5 @@ public class JsonTest { assert copyentity.getMapEntity().get("entity").getD2().equals(d2); } + } diff --git a/caf-commons/caf-commons-serialization/src/test/resources/application.yaml b/caf-commons/caf-commons-serialization/src/test/resources/application.yaml index ae33bf84f..2f2b11902 100644 --- a/caf-commons/caf-commons-serialization/src/test/resources/application.yaml +++ b/caf-commons/caf-commons-serialization/src/test/resources/application.yaml @@ -1,2 +1,10 @@ serialize: - type: Protobuf \ No newline at end of file + type: Protobuf +caf-boot: + serialization: + json: + max-string-length: 100M + max-nesting-depth : 2K + max-num-length : 2K + max-name-length : 80K + max-doc-length : 2L \ No newline at end of file -- Gitee From a78100e4b56e19cef21ca7a3fa86fab1cb9b627e Mon Sep 17 00:00:00 2001 From: yulongchao Date: Wed, 4 Sep 2024 16:51:30 +0800 Subject: [PATCH 52/54] jsonconfig --- .../io/iec/edp/caf/commons/JacksonUtils.java | 38 ++++++------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java index 25dd32f23..1788e4572 100644 --- a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java +++ b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java @@ -243,38 +243,22 @@ class JacksonUtils { } private static int convertStringToInt(String input) { - // 检查输入是否为空或非法 + if (input == null || input.isEmpty()) { throw new IllegalArgumentException("Input cannot be null or empty."); } - // 用于存储数字和单位 - int number = 0; - char unit = 'N'; // 默认为无单位 - - // 遍历字符串中的每个字符 - for (int i = 0; i < input.length(); i++) { - char c = input.charAt(i); - // 如果是数字，则转换并累加到number上 - if (Character.isDigit(c)) { - number = number * 10 + (c - '0'); - } - // 如果是非数字字符，则认为是单位 - else { - unit = c; - break; // 只取第一个非数字字符作为单位 - } - } + int number = 100000000; + + if(input.contains("K")) + number = Integer.parseInt(input.substring(0,input.length()-1))*1000; + else if(input.contains("M")) + number = Integer.parseInt(input.substring(0,input.length()-1))*1000000; + else + number = Integer.parseInt(input); + + return number; - // 根据单位转换为整数 - switch (unit) { - case 'K': - return number * 1000; - case 'M': - return number * 1000000; - default: - return number; // 无单位直接返回 - } } private static long convertStringToLong(String input) { -- Gitee From cce5d1f12c34d361747e924ff1c98d8db354b784 Mon Sep 17 00:00:00 2001 From: yulongchao Date: Wed, 4 Sep 2024 16:54:48 +0800 Subject: [PATCH 53/54] jsonconfig --- .../java/io/iec/edp/caf/common/JSONUtils.java | 36 +++++-------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/common/JSONUtils.java b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/common/JSONUtils.java index 3c068630e..b10847287 100644 --- a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/common/JSONUtils.java +++ b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/common/JSONUtils.java @@ -201,38 +201,20 @@ import java.time.format.DateTimeFormatter; } private static int convertStringToInt(String input) { - // 检查输入是否为空或非法 if (input == null || input.isEmpty()) { throw new IllegalArgumentException("Input cannot be null or empty."); } - // 用于存储数字和单位 - int number = 0; - char unit = 'N'; // 默认为无单位 - - // 遍历字符串中的每个字符 - for (int i = 0; i < input.length(); i++) { - char c = input.charAt(i); - // 如果是数字，则转换并累加到number上 - if (Character.isDigit(c)) { - number = number * 10 + (c - '0'); - } - // 如果是非数字字符，则认为是单位 - else { - unit = c; - break; // 只取第一个非数字字符作为单位 - } - } + int number = 100000000; - // 根据单位转换为整数 - switch (unit) { - case 'K': - return number * 1000; - case 'M': - return number * 1000000; - default: - return number; // 无单位直接返回 - } + if(input.contains("K")) + number = Integer.parseInt(input.substring(0,input.length()-1))*1000; + else if(input.contains("M")) + number = Integer.parseInt(input.substring(0,input.length()-1))*1000000; + else + number = Integer.parseInt(input); + + return number; } private static long convertStringToLong(String input) { -- Gitee From 473c822f2130a7f62fea533a162a1e683cc92664 Mon Sep 17 00:00:00 2001 From: yulongchao Date: Wed, 4 Sep 2024 17:01:39 +0800 Subject: [PATCH 54/54] jsonconfig --- .../src/main/java/io/iec/edp/caf/common/JSONUtils.java | 8 +++----- .../main/java/io/iec/edp/caf/commons/JacksonUtils.java | 10 +++------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/common/JSONUtils.java b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/common/JSONUtils.java index b10847287..a304231ce 100644 --- a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/common/JSONUtils.java +++ b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/common/JSONUtils.java @@ -207,12 +207,10 @@ import java.time.format.DateTimeFormatter; int number = 100000000; - if(input.contains("K")) + if(input.endsWith("K")) number = Integer.parseInt(input.substring(0,input.length()-1))*1000; - else if(input.contains("M")) + else if(input.endsWith("M")) number = Integer.parseInt(input.substring(0,input.length()-1))*1000000; - else - number = Integer.parseInt(input); return number; } @@ -222,7 +220,7 @@ import java.time.format.DateTimeFormatter; throw new IllegalArgumentException("Input cannot be null or empty."); } long num = -1L; - if(input.contains("L")) + if(input.endsWith("L")) num = Long.parseLong(input.substring(0,input.length()-1)); else num = Long.parseLong(input); diff --git a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java index 1788e4572..521df29c7 100644 --- a/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java +++ b/caf-commons/caf-commons-serialization/src/main/java/io/iec/edp/caf/commons/JacksonUtils.java @@ -243,22 +243,18 @@ class JacksonUtils { } private static int convertStringToInt(String input) { - if (input == null || input.isEmpty()) { throw new IllegalArgumentException("Input cannot be null or empty."); } int number = 100000000; - if(input.contains("K")) + if(input.endsWith("K")) number = Integer.parseInt(input.substring(0,input.length()-1))*1000; - else if(input.contains("M")) + else if(input.endsWith("M")) number = Integer.parseInt(input.substring(0,input.length()-1))*1000000; - else - number = Integer.parseInt(input); return number; - } private static long convertStringToLong(String input) { @@ -266,7 +262,7 @@ class JacksonUtils { throw new IllegalArgumentException("Input cannot be null or empty."); } long num = -1L; - if(input.contains("L")) + if(input.endsWith("L")) num = Long.parseLong(input.substring(0,input.length()-1)); else num = Long.parseLong(input); -- Gitee