From 2a3897e08d211e7a79a7d357520b5162b051f9ed Mon Sep 17 00:00:00 2001 From: renxb Date: Wed, 14 Aug 2024 18:37:53 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- caf-boot-starters/caf-boot-starter-msu/pom.xml | 4 ++++ .../iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java | 6 +++++- caf-bootstrap/src/main/resources/banner-gscloud.txt | 2 +- caf-bootstrap/src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/caf-boot-starters/caf-boot-starter-msu/pom.xml b/caf-boot-starters/caf-boot-starter-msu/pom.xml index b4e9b0a6..124fedcc 100644 --- a/caf-boot-starters/caf-boot-starter-msu/pom.xml +++ b/caf-boot-starters/caf-boot-starter-msu/pom.xml @@ -37,6 +37,10 @@ io.iec.edp caf-msu-core + + io.iec.edp + caf-commons-runtime + diff --git a/caf-boot-starters/caf-boot-starter-msu/src/main/java/io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java b/caf-boot-starters/caf-boot-starter-msu/src/main/java/io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java index c36321d8..05a14156 100644 --- a/caf-boot-starters/caf-boot-starter-msu/src/main/java/io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java +++ b/caf-boot-starters/caf-boot-starter-msu/src/main/java/io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java @@ -18,6 +18,7 @@ package io.iec.edp.caf.msu.config; import com.alibaba.boot.nacos.discovery.autoconfigure.NacosDiscoveryAutoConfiguration; +import io.iec.edp.caf.commons.runtime.msu.properties.MsuConfigProperties; import io.iec.edp.caf.impl.ServiceUnitAwareServiceImpl; import io.iec.edp.caf.msu.api.MsuService; import io.iec.edp.caf.msu.api.ServiceUnitAwareService; @@ -45,7 +46,10 @@ import org.springframework.context.annotation.Configuration; * @date 2020-06-05 */ @Configuration(proxyBeanMethods = false) -@EnableConfigurationProperties(MsuProperties.class) +@EnableConfigurationProperties(value = { + MsuProperties.class, + MsuConfigProperties.class +}) @AutoConfigureBefore(NacosDiscoveryAutoConfiguration.class) public class MsuServiceAutoConfiguration { diff --git a/caf-bootstrap/src/main/resources/banner-gscloud.txt b/caf-bootstrap/src/main/resources/banner-gscloud.txt index 9e924183..dca54fd6 100644 --- a/caf-bootstrap/src/main/resources/banner-gscloud.txt +++ b/caf-bootstrap/src/main/resources/banner-gscloud.txt @@ -9,7 +9,7 @@ ${AnsiColor.BRIGHT_CYAN} ${AnsiColor.BLUE} :: Enterprise Digitalization Capabilities Platform :: ${AnsiColor.BRIGHT_CYAN} ${AnsiColor.BLUE} ------------------------------------------------------- - Powered by Cloud Application Foundation Server v5.0 + Powered by Cloud Application Foundation Server v6.5 -------------------------------------------------------${AnsiStyle.NORMAL} PROCESSOR_ARCH: ${PROCESSOR_ARCHITECTURE} JAVA_HOME: ${JAVA_HOME} diff --git a/caf-bootstrap/src/main/resources/banner.txt b/caf-bootstrap/src/main/resources/banner.txt index 637f590a..10c79d30 100644 --- a/caf-bootstrap/src/main/resources/banner.txt +++ b/caf-bootstrap/src/main/resources/banner.txt @@ -8,7 +8,7 @@ ${AnsiColor.BRIGHT_CYAN} ${AnsiColor.BLUE} :: Enterprise Digitalization Capabilities Platform :: ${AnsiColor.BRIGHT_CYAN} ${AnsiColor.BLUE} ------------------------------------------------------- - Powered by Cloud Application Foundation Server v5.0 + Powered by Cloud Application Foundation Server v6.5 -------------------------------------------------------${AnsiStyle.NORMAL} PROCESSOR_ARCH: ${PROCESSOR_ARCHITECTURE} JAVA_HOME: ${JAVA_HOME} diff --git a/pom.xml b/pom.xml index b2ade4c1..27f978fa 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 1.8 2.4.13 5.3.26 - 1.7.0-rc.2 + 1.7.0-rc.3 https://git.iec.io/caf/caf-boot -- Gitee From 4a147fb8b240064d9f845098e39505112b5c9c71 Mon Sep 17 00:00:00 2001 From: Ren xuebing Date: Wed, 14 Aug 2024 18:40:14 +0800 Subject: [PATCH 2/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19210c7d..0ebfe182 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,7 @@ variables: - 1.2.x - 1.3.x - 1.6.x + - IAG8P8-调整版本版本和framwork版本 .refs-to-publish-snapshot: only: @@ -36,6 +37,7 @@ variables: - 1.2.x - 1.3.x - 1.6.x + - IAG8P8-调整版本版本和framwork版本 .refs-to-publish-release: only: @@ -50,4 +52,5 @@ variables: - 1.2.x - 1.3.x - 1.6.x + - IAG8P8-调整版本版本和framwork版本 - tags \ No newline at end of file -- Gitee From 89743d70074c56562602e379a6c0dcd71b66505a Mon Sep 17 00:00:00 2001 From: renxb Date: Wed, 14 Aug 2024 18:46:03 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/caf-boot-starters/caf-boot-starter-msu/src/main/java/io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java b/caf-boot-starters/caf-boot-starter-msu/src/main/java/io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java index 05a14156..9028bff3 100644 --- a/caf-boot-starters/caf-boot-starter-msu/src/main/java/io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java +++ b/caf-boot-starters/caf-boot-starter-msu/src/main/java/io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java @@ -46,10 +46,7 @@ import org.springframework.context.annotation.Configuration; * @date 2020-06-05 */ @Configuration(proxyBeanMethods = false) -@EnableConfigurationProperties(value = { - MsuProperties.class, - MsuConfigProperties.class -}) +@EnableConfigurationProperties(MsuProperties.class) @AutoConfigureBefore(NacosDiscoveryAutoConfiguration.class) public class MsuServiceAutoConfiguration { -- Gitee From 168ea89194d07afb5c48c4bd6e3cb0977a1fe007 Mon Sep 17 00:00:00 2001 From: renxb Date: Wed, 14 Aug 2024 18:49:35 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java | 1 - 1 file changed, 1 deletion(-) diff --git a/caf-boot-starters/caf-boot-starter-msu/src/main/java/io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java b/caf-boot-starters/caf-boot-starter-msu/src/main/java/io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java index 9028bff3..c36321d8 100644 --- a/caf-boot-starters/caf-boot-starter-msu/src/main/java/io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java +++ b/caf-boot-starters/caf-boot-starter-msu/src/main/java/io/iec/edp/caf/msu/config/MsuServiceAutoConfiguration.java @@ -18,7 +18,6 @@ package io.iec.edp.caf.msu.config; import com.alibaba.boot.nacos.discovery.autoconfigure.NacosDiscoveryAutoConfiguration; -import io.iec.edp.caf.commons.runtime.msu.properties.MsuConfigProperties; import io.iec.edp.caf.impl.ServiceUnitAwareServiceImpl; import io.iec.edp.caf.msu.api.MsuService; import io.iec.edp.caf.msu.api.ServiceUnitAwareService; -- Gitee From 3753c6c214efa29dc072926419b4ab6877f5604c Mon Sep 17 00:00:00 2001 From: GitLab CI Bot Date: Wed, 14 Aug 2024 10:54:23 +0000 Subject: [PATCH 5/8] [maven-release-plugin] prepare release v1.7.0-rc.3 --- caf-boot-autoconfigure/pom.xml | 2 +- caf-boot-config-client/pom.xml | 2 +- caf-boot-parent/pom.xml | 4 ++-- .../caf-boot-starter-application-context/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-base/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-business-context/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-caching/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-data/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-event/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-i18n/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-lock/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-logging/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-msu-database/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-msu-kubernetes/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-msu-nacos/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-msu/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-rest/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-rpc-extension/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-rpc/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-security/pom.xml | 2 +- .../caf-boot-starter-session-extension/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-session/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-tenancy/pom.xml | 2 +- caf-boot-starters/caf-boot-starter-web/pom.xml | 2 +- caf-boot-starters/pom.xml | 2 +- caf-bootstrap/pom.xml | 2 +- pom.xml | 6 +++--- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/caf-boot-autoconfigure/pom.xml b/caf-boot-autoconfigure/pom.xml index 5f1baa10..ce00ca5e 100644 --- a/caf-boot-autoconfigure/pom.xml +++ b/caf-boot-autoconfigure/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-boot - 1.7.0-SNAPSHOT + 1.7.0-rc.3 caf-boot-autoconfigure diff --git a/caf-boot-config-client/pom.xml b/caf-boot-config-client/pom.xml index aee6e94c..4c45ff5b 100644 --- a/caf-boot-config-client/pom.xml +++ b/caf-boot-config-client/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-boot - 1.7.0-SNAPSHOT + 1.7.0-rc.3 caf-boot-config-client diff --git a/caf-boot-parent/pom.xml b/caf-boot-parent/pom.xml index 419de295..6fe8a029 100644 --- a/caf-boot-parent/pom.xml +++ b/caf-boot-parent/pom.xml @@ -21,7 +21,7 @@ io.iec.edp caf-boot - 1.7.0-SNAPSHOT + 1.7.0-rc.3 caf-boot-parent @@ -69,7 +69,7 @@ scm:git:git://git.iec.io/caf/caf-boot scm:git:ssh://git@git.iec.io:6060/caf/caf-boot.git https://git.iec.io/caf/caf-boot - HEAD + v1.7.0-rc.3