diff --git a/.github/workflows/junit.yml b/.github/workflows/junit.yml index 564057e0d..8f8f0d9c9 100644 --- a/.github/workflows/junit.yml +++ b/.github/workflows/junit.yml @@ -3,6 +3,7 @@ name: Junit Test on: push: branches: + - 2025.0 - 2024 - 2023 - 2022 @@ -15,6 +16,7 @@ on: - '**.md' pull_request: branches: + - 2025.0 - 2024 - 2023 - 2022 @@ -41,7 +43,9 @@ jobs: branch_name=${{ github.base_ref }} fi echo $branch_name - if [[ "$branch_name" == "2024" ]]; then + if [[ "$branch_name" == "2025.0" ]]; then + echo "jdks=[17,21,25]" >> $GITHUB_OUTPUT + elif [[ "$branch_name" == "2024" ]]; then echo "jdks=[17,21]" >> $GITHUB_OUTPUT elif [[ "$branch_name" == "2023" ]]; then echo "jdks=[17,21]" >> $GITHUB_OUTPUT diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index f6bddb2ff..0e3a7f15d 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -3,6 +3,7 @@ name: License checker on: push: branches: + - 2025.0 - 2024 - 2023 - 2022 @@ -15,6 +16,7 @@ on: - '**.md' pull_request: branches: + - 2025.0 - 2024 - 2023 - 2022 diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 4be4c5f30..2b0ca4620 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -3,6 +3,7 @@ name: Snapshot on: push: branches: + - 2025.0 - 2024 - 2023 - 2022 @@ -41,7 +42,9 @@ jobs: id: set-jdk run: | shopt -s nocasematch - if [[ "${{ github.ref_name }}" == "2024" ]]; then + if [[ "${{ github.ref_name }}" == "2025.0" ]]; then + echo "jdk=17" >> $GITHUB_OUTPUT + elif [[ "${{ github.ref_name }}" == "2024" ]]; then echo "jdk=17" >> $GITHUB_OUTPUT elif [[ "${{ github.ref_name }}" == "2023" ]]; then echo "jdk=17" >> $GITHUB_OUTPUT diff --git a/README-zh.md b/README-zh.md index 43b434053..bc5ceaf8e 100644 --- a/README-zh.md +++ b/README-zh.md @@ -5,8 +5,8 @@ [![Contributors](https://img.shields.io/github/contributors/Tencent/spring-cloud-tencent)](https://github.com/Tencent/spring-cloud-tencent/graphs/contributors) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) -[![Test with Junit](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test17.yml/badge.svg?branch=2024)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test17.yml) -[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2024/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2024) +[![Test with Junit](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test17.yml/badge.svg?branch=2025.0)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test17.yml) +[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2025.0/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2025.0) [English](./README.md) | 简体中文 diff --git a/README.md b/README.md index 13f4689f5..c536f5505 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ [![Contributors](https://img.shields.io/github/contributors/Tencent/spring-cloud-tencent)](https://github.com/Tencent/spring-cloud-tencent/graphs/contributors) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) -[![Junit Test](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit.yml/badge.svg?branch=2024)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit.yml) -[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2024/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2024) +[![Junit Test](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit.yml/badge.svg?branch=2025.0)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit.yml) +[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2025.0/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2025.0) English | [简体中文](./README-zh.md) diff --git a/pom.xml b/pom.xml index 604427d78..76f22f2aa 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ ${revision} Spring Cloud Tencent Spring Cloud Tencent - https://github.com/Tencent/spring-cloud-tencent/tree/2024 + https://github.com/Tencent/spring-cloud-tencent/tree/2025.0 Tencent @@ -26,7 +26,7 @@ The BSD 3-Clause License (BSD3) - https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2024/LICENSE + https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2025.0/LICENSE repo @@ -90,16 +90,16 @@ - 2.1.2.0-2024.0.3-SNAPSHOT + 2.1.2.0-2025.0.2-SNAPSHOT 6.2.15 - 3.4.12 + 3.5.11 - 2024.0.3 + 2025.0.2 2.0.2 diff --git a/spring-cloud-starter-tencent-metadata-transfer/pom.xml b/spring-cloud-starter-tencent-metadata-transfer/pom.xml index 31e702853..a5b7aa919 100644 --- a/spring-cloud-starter-tencent-metadata-transfer/pom.xml +++ b/spring-cloud-starter-tencent-metadata-transfer/pom.xml @@ -23,7 +23,7 @@ org.springframework.cloud - spring-cloud-starter-gateway + spring-cloud-starter-gateway-server-webflux true diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilterTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilterTest.java index d47ba7960..d8e59781a 100644 --- a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilterTest.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilterTest.java @@ -46,7 +46,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen classes = DecodeTransferMetadataServletFilterTest.TestApplication.class, properties = {"spring.config.location = classpath:application-test.yml", "spring.main.web-application-type = servlet", - "spring.cloud.gateway.enabled = false"}) + "spring.cloud.gateway.server.webflux.enabled = false"}) public class DecodeTransferMetadataServletFilterTest { @Autowired diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptorTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptorTest.java index c69b68f6d..29a69220b 100644 --- a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptorTest.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptorTest.java @@ -49,7 +49,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen classes = EncodeTransferMedataFeignInterceptorTest.TestApplication.class, properties = {"server.port=48081", "spring.config.location = classpath:application-test.yml", "spring.main.web-application-type = servlet", - "spring.cloud.gateway.enabled = false"}) + "spring.cloud.gateway.server.webflux.enabled = false"}) public class EncodeTransferMedataFeignInterceptorTest { @Autowired diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml b/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml index 9befa1ade..9173e5223 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml @@ -40,7 +40,7 @@ org.springframework.cloud - spring-cloud-starter-gateway + spring-cloud-starter-gateway-server-webflux true diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/GatewayPolarisCircuitBreakerAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/GatewayPolarisCircuitBreakerAutoConfiguration.java index c5159c0fa..05f6cd849 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/GatewayPolarisCircuitBreakerAutoConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/GatewayPolarisCircuitBreakerAutoConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration; * @author seanyu 2023-02-27 */ @Configuration(proxyBeanMethods = false) -@ConditionalOnProperty(name = "spring.cloud.gateway.enabled", matchIfMissing = true) +@ConditionalOnProperty(name = "spring.cloud.gateway.server.webflux.enabled", matchIfMissing = true) @ConditionalOnClass(name = {"org.springframework.web.reactive.DispatcherHandler", "org.springframework.cloud.gateway.config.GatewayAutoConfiguration"}) public class GatewayPolarisCircuitBreakerAutoConfiguration { diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/config/LosslessConfigModifierTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/config/LosslessConfigModifierTest.java index 7d2becdc9..96a03357d 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/config/LosslessConfigModifierTest.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/config/LosslessConfigModifierTest.java @@ -44,7 +44,7 @@ public class LosslessConfigModifierTest { .withPropertyValues("spring.cloud.polaris.admin.port=20000") .withPropertyValues("spring.cloud.polaris.lossless.delayRegisterInterval=10") .withPropertyValues("spring.application.name=test") - .withPropertyValues("spring.cloud.gateway.enabled=false"); + .withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false"); private final ApplicationContextRunner healthCheckContextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(TestApplication.class)) @@ -55,14 +55,14 @@ public class LosslessConfigModifierTest { .withPropertyValues("spring.cloud.polaris.lossless.healthCheckPath=/xxx") .withPropertyValues("spring.cloud.polaris.lossless.healthCheckInterval=5") .withPropertyValues("spring.application.name=test") - .withPropertyValues("spring.cloud.gateway.enabled=false"); + .withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false"); private final ApplicationContextRunner disabledContextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(TestApplication.class)) .withPropertyValues("spring.cloud.nacos.discovery.enabled=false") .withPropertyValues("spring.cloud.polaris.enabled=true") .withPropertyValues("spring.cloud.polaris.lossless.enabled=false") .withPropertyValues("spring.application.name=test") - .withPropertyValues("spring.cloud.gateway.enabled=false"); + .withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false"); @BeforeEach void setUp() { diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/config/WarmupConfigModifierTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/config/WarmupConfigModifierTest.java index 3df6e58c9..1e1ada424 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/config/WarmupConfigModifierTest.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/config/WarmupConfigModifierTest.java @@ -42,14 +42,14 @@ public class WarmupConfigModifierTest { .withPropertyValues("spring.cloud.polaris.enabled=true") .withPropertyValues("spring.cloud.polaris.warmup.enabled=true") .withPropertyValues("spring.application.name=test") - .withPropertyValues("spring.cloud.gateway.enabled=false"); + .withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false"); private final ApplicationContextRunner disabledContextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(TestApplication.class)) .withPropertyValues("spring.cloud.nacos.discovery.enabled=false") .withPropertyValues("spring.cloud.polaris.enabled=true") .withPropertyValues("spring.cloud.polaris.warmup.enabled=false") .withPropertyValues("spring.application.name=test") - .withPropertyValues("spring.cloud.gateway.enabled=false"); + .withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false"); @BeforeEach void setUp() { diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/refresh/ServiceInstanceChangeCallbackTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/refresh/ServiceInstanceChangeCallbackTest.java index 24b2ef674..354f90a75 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/refresh/ServiceInstanceChangeCallbackTest.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/refresh/ServiceInstanceChangeCallbackTest.java @@ -45,7 +45,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen classes = ServiceInstanceChangeCallbackTest.TestApplication.class, properties = {"spring.config.location = classpath:application-test.yml", "spring.main.web-application-type = servlet", - "spring.cloud.gateway.enabled = false"}) + "spring.cloud.gateway.server.webflux.enabled = false"}) public class ServiceInstanceChangeCallbackTest { @Autowired diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/eager/instrument/feign/FeignEagerLoadContextInitializerTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/eager/instrument/feign/FeignEagerLoadContextInitializerTest.java index 243de0f6d..9535a6c53 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/eager/instrument/feign/FeignEagerLoadContextInitializerTest.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/eager/instrument/feign/FeignEagerLoadContextInitializerTest.java @@ -68,7 +68,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen "server.port=48085", "spring.config.location = classpath:application-test.yml", "spring.main.web-application-type = servlet", - "spring.cloud.gateway.enabled = false", + "spring.cloud.gateway.server.webflux.enabled = false", "spring.cloud.polaris.discovery.eager-load.enabled = true", "spring.cloud.polaris.discovery.eager-load.feign.enabled = true", "spring.cloud.loadbalancer.eager-load.enabled = true", diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/eager/instrument/loadbalancer/PolarisLoadBalancerEagerContextInitializerTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/eager/instrument/loadbalancer/PolarisLoadBalancerEagerContextInitializerTest.java index 36d34fdaa..784baea5c 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/eager/instrument/loadbalancer/PolarisLoadBalancerEagerContextInitializerTest.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/eager/instrument/loadbalancer/PolarisLoadBalancerEagerContextInitializerTest.java @@ -56,7 +56,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen "server.port=48086", "spring.config.location = classpath:application-test.yml", "spring.main.web-application-type = servlet", - "spring.cloud.gateway.enabled = false", + "spring.cloud.gateway.server.webflux.enabled = false", "spring.cloud.polaris.discovery.eager-load.enabled = true", "spring.cloud.loadbalancer.eager-load.enabled = true", "spring.cloud.loadbalancer.eager-load.clients = test-service-1,test-service-2,test-service-3" diff --git a/spring-cloud-starter-tencent-polaris-router/pom.xml b/spring-cloud-starter-tencent-polaris-router/pom.xml index 9ae6e167d..70968c80b 100644 --- a/spring-cloud-starter-tencent-polaris-router/pom.xml +++ b/spring-cloud-starter-tencent-polaris-router/pom.xml @@ -36,7 +36,7 @@ org.springframework.cloud - spring-cloud-gateway-server + spring-cloud-gateway-server-webflux true @@ -50,7 +50,7 @@ org.springframework.cloud - spring-cloud-gateway-server-mvc + spring-cloud-gateway-server-webmvc true diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/feign/RouterLabelFeignInterceptorTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/feign/RouterLabelFeignInterceptorTest.java index 574979bb4..df5ad35f0 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/feign/RouterLabelFeignInterceptorTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/feign/RouterLabelFeignInterceptorTest.java @@ -48,7 +48,7 @@ import static org.mockito.Mockito.mock; */ @ExtendWith(SpringExtension.class) @SpringBootTest(classes = RouterLabelFeignInterceptorTest.TestApplication.class, - properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.cloud.gateway.enabled=false"}) + properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.cloud.gateway.server.webflux.enabled=false"}) public class RouterLabelFeignInterceptorTest { @Test diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/resttemplate/RouterLabelRestTemplateInterceptorTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/resttemplate/RouterLabelRestTemplateInterceptorTest.java index 5f741d775..4cf556afd 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/resttemplate/RouterLabelRestTemplateInterceptorTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/resttemplate/RouterLabelRestTemplateInterceptorTest.java @@ -55,7 +55,7 @@ import static org.mockito.Mockito.when; */ @ExtendWith(SpringExtension.class) @SpringBootTest(classes = RouterLabelRestTemplateInterceptorTest.TestApplication.class, - properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.cloud.gateway.enabled=false"}) + properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.cloud.gateway.server.webflux.enabled=false"}) public class RouterLabelRestTemplateInterceptorTest { @Mock diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/scg/RouterLabelGlobalFilterTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/scg/RouterLabelGlobalFilterTest.java index 0baa748d2..b18104f4f 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/scg/RouterLabelGlobalFilterTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/scg/RouterLabelGlobalFilterTest.java @@ -45,7 +45,7 @@ import static org.springframework.cloud.gateway.filter.ReactiveLoadBalancerClien */ @ExtendWith(SpringExtension.class) @SpringBootTest(classes = RouterLabelGlobalFilterTest.TestApplication.class, - properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.main.web-application-type=reactive", "spring.cloud.gateway.mvc.enabled=false"}) + properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.main.web-application-type=reactive", "spring.cloud.gateway.server.webmvc.enabled=false"}) public class RouterLabelGlobalFilterTest { @Test diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/scgmvc/RouterLabelMvcFilterTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/scgmvc/RouterLabelMvcFilterTest.java index e519830f2..387e51535 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/scgmvc/RouterLabelMvcFilterTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/instrument/scgmvc/RouterLabelMvcFilterTest.java @@ -47,7 +47,7 @@ import static org.springframework.cloud.gateway.server.mvc.filter.FormFilter.FOR */ @ExtendWith(SpringExtension.class) @SpringBootTest(classes = RouterLabelMvcFilterTest.TestApplication.class, - properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.main.web-application-type=servlet", "spring.cloud.gateway.enabled=false"}) + properties = {"spring.cloud.polaris.namespace=test", "spring.application.name=test", "spring.main.web-application-type=servlet", "spring.cloud.gateway.server.webflux.enabled=false"}) public class RouterLabelMvcFilterTest { @Test diff --git a/spring-cloud-tencent-commons/pom.xml b/spring-cloud-tencent-commons/pom.xml index b447abb3b..13265a761 100644 --- a/spring-cloud-tencent-commons/pom.xml +++ b/spring-cloud-tencent-commons/pom.xml @@ -65,7 +65,7 @@ org.springframework.cloud - spring-cloud-starter-gateway + spring-cloud-starter-gateway-server-webflux true diff --git a/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/OkHttpUtilTest.java b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/OkHttpUtilTest.java index 031c7176e..418512cc9 100644 --- a/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/OkHttpUtilTest.java +++ b/spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/OkHttpUtilTest.java @@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; properties = { "spring.application.name=test", "spring.cloud.polaris.discovery.register=false", - "spring.cloud.gateway.enabled=false" + "spring.cloud.gateway.server.webflux.enabled=false" }) public class OkHttpUtilTest { diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index d81a674ea..89b8904a3 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.2.4 + 4.3.3 4.0.0 @@ -16,7 +16,7 @@ pom Spring Cloud Tencent Dependencies Spring Cloud Tencent Dependencies - https://github.com/Tencent/spring-cloud-tencent/tree/2024 + https://github.com/Tencent/spring-cloud-tencent/tree/2025.0 Tencent @@ -26,7 +26,7 @@ The BSD 3-Clause License (BSD3) - https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2024/LICENSE + https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2025.0/LICENSE repo @@ -71,7 +71,7 @@ - 2.1.2.0-2024.0.3-SNAPSHOT + 2.1.2.0-2025.0.2-SNAPSHOT 2.1.2.0-SNAPSHOT diff --git a/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-gateway/pom.xml b/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-gateway/pom.xml index 81e3214b4..cf8267c7b 100644 --- a/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-gateway/pom.xml +++ b/spring-cloud-tencent-examples/polaris-router-grayrelease-lane-example/router-grayrelease-lane-gateway/pom.xml @@ -25,7 +25,7 @@ org.springframework.cloud - spring-cloud-starter-gateway + spring-cloud-starter-gateway-server-webflux diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-mvc-service/pom.xml b/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-mvc-service/pom.xml index 33a37a878..a4e718f2a 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-mvc-service/pom.xml +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-mvc-service/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud - spring-cloud-starter-gateway-mvc + spring-cloud-starter-gateway-server-webmvc diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/pom.xml b/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/pom.xml index 81e4e1df9..b4055a949 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/pom.xml +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud - spring-cloud-starter-gateway + spring-cloud-starter-gateway-server-webflux diff --git a/spring-cloud-tencent-examples/tsf-example/msgw-scg/pom.xml b/spring-cloud-tencent-examples/tsf-example/msgw-scg/pom.xml index 135d28ea2..16e7f9f95 100644 --- a/spring-cloud-tencent-examples/tsf-example/msgw-scg/pom.xml +++ b/spring-cloud-tencent-examples/tsf-example/msgw-scg/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud - spring-cloud-starter-gateway + spring-cloud-starter-gateway-server-webflux diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/pom.xml b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/pom.xml index 4690f32c7..dda733782 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/pom.xml +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/pom.xml @@ -32,7 +32,7 @@ org.springframework.cloud - spring-cloud-gateway-server + spring-cloud-gateway-server-webflux true diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/GatewayPluginAutoConfigurationTest.java b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/GatewayPluginAutoConfigurationTest.java index 45c6ec6d5..b4aaa5165 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/GatewayPluginAutoConfigurationTest.java +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-gateway-plugin/src/test/java/com/tencent/cloud/plugin/gateway/GatewayPluginAutoConfigurationTest.java @@ -56,7 +56,7 @@ class GatewayPluginAutoConfigurationTest { GatewayPluginAutoConfiguration.class )) .withPropertyValues( - "spring.cloud.gateway.enabled=false", // not needed for this test + "spring.cloud.gateway.server.webflux.enabled=false", // not needed for this test "spring.cloud.tencent.plugin.scg.enabled=true", "spring.cloud.tencent.plugin.scg.context.enabled=true", "spring.cloud.tencent.gateway.routes.test_group.uri=lb://test-group" diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/config/location/PolarisLocationConfigModifierTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/config/location/PolarisLocationConfigModifierTest.java index 080a9b380..fe3ce397d 100644 --- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/config/location/PolarisLocationConfigModifierTest.java +++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/config/location/PolarisLocationConfigModifierTest.java @@ -43,14 +43,14 @@ class PolarisLocationConfigModifierTest { .withPropertyValues("spring.cloud.polaris.enabled=true") .withPropertyValues("spring.cloud.polaris.location.cloud.enabled=true") .withPropertyValues("spring.application.name=test") - .withPropertyValues("spring.cloud.gateway.enabled=false"); + .withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false"); private final ApplicationContextRunner disabledContextRunner = new ApplicationContextRunner() .withUserConfiguration(TestApplication.class) .withPropertyValues("spring.cloud.polaris.enabled=true") .withPropertyValues("spring.cloud.polaris.location.cloud.enabled=false") .withPropertyValues("spring.application.name=test") - .withPropertyValues("spring.cloud.gateway.enabled=false"); + .withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false"); @BeforeEach void setUp() { diff --git a/spring-cloud-tencent-rpc-enhancement/pom.xml b/spring-cloud-tencent-rpc-enhancement/pom.xml index bc67386be..d854358aa 100644 --- a/spring-cloud-tencent-rpc-enhancement/pom.xml +++ b/spring-cloud-tencent-rpc-enhancement/pom.xml @@ -55,7 +55,7 @@ org.springframework.cloud - spring-cloud-gateway-server + spring-cloud-gateway-server-webflux true diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfigurationTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfigurationTest.java index be2a6ad18..c15b012ab 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfigurationTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfigurationTest.java @@ -49,7 +49,7 @@ public class RpcEnhancementAutoConfigurationTest { RpcEnhancementAutoConfiguration.class, PolarisRestTemplateAutoConfigurationTester.class, FeignLoadBalancerAutoConfiguration.class)) - .withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true", "spring.application.name=test", "spring.cloud.gateway.enabled=false"); + .withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true", "spring.application.name=test", "spring.cloud.gateway.server.webflux.enabled=false"); @Test public void testDefaultInitialization() { diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementPropertiesTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementPropertiesTest.java index cafd558bf..54184fe48 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementPropertiesTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementPropertiesTest.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @SpringBootTest(classes = RpcEnhancementPropertiesTest.TestApplication.class, properties = { "spring.application.name=test", - "spring.cloud.gateway.enabled=false", + "spring.cloud.gateway.server.webflux.enabled=false", "spring.cloud.tencent.rpc-enhancement=true", "spring.cloud.tencent.rpc-enhancement.ignore-body=false" }) diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementReporterPropertiesTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementReporterPropertiesTest.java index 60a91f359..ba32c13e4 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementReporterPropertiesTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementReporterPropertiesTest.java @@ -40,7 +40,7 @@ import static org.springframework.http.HttpStatus.Series.SERVER_ERROR; @ExtendWith(SpringExtension.class) @SpringBootTest(classes = RpcEnhancementReporterPropertiesTest.TestApplication.class, properties = { "spring.application.name=test", - "spring.cloud.gateway.enabled=false", + "spring.cloud.gateway.server.webflux.enabled=false", "spring.cloud.tencent.rpc-enhancement.reporter=true" }) @ActiveProfiles("test") diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/feign/EnhancedFeignClientTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/feign/EnhancedFeignClientTest.java index eec56a45c..ed4e733df 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/feign/EnhancedFeignClientTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/instrument/feign/EnhancedFeignClientTest.java @@ -59,7 +59,7 @@ import static org.mockito.Mockito.mock; */ @ExtendWith(SpringExtension.class) @SpringBootTest(classes = EnhancedFeignClientTest.TestApplication.class, - properties = {"spring.cloud.polaris.namespace=Test", "spring.cloud.polaris.service=TestApp", "spring.cloud.gateway.enabled=false"}) + properties = {"spring.cloud.polaris.namespace=Test", "spring.cloud.polaris.service=TestApp", "spring.cloud.gateway.server.webflux.enabled=false"}) public class EnhancedFeignClientTest { @Autowired diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/PolarisStatPropertiesTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/PolarisStatPropertiesTest.java index b76c95b05..bb6ac8293 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/PolarisStatPropertiesTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/PolarisStatPropertiesTest.java @@ -45,7 +45,7 @@ public class PolarisStatPropertiesTest { .withPropertyValues("spring.cloud.polaris.stat.pushgateway.service=test-service") .withPropertyValues("spring.cloud.polaris.stat.pushgateway.push-interval=1000") .withPropertyValues("spring.cloud.polaris.stat.pushgateway.override-host=127.0.0.1") - .withPropertyValues("spring.cloud.gateway.enabled=false"); + .withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false"); @Test public void testDefaultInitialization() { diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/StatConfigModifierTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/StatConfigModifierTest.java index 8714650a8..8768855ee 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/StatConfigModifierTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/StatConfigModifierTest.java @@ -45,7 +45,7 @@ public class StatConfigModifierTest { .withPropertyValues("spring.cloud.polaris.stat.port=20000") .withPropertyValues("spring.cloud.polaris.stat.path=/xxx") .withPropertyValues("spring.application.name=test") - .withPropertyValues("spring.cloud.gateway.enabled=false"); + .withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false"); private final ApplicationContextRunner pushContextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(TestApplication.class)) @@ -59,14 +59,14 @@ public class StatConfigModifierTest { .withPropertyValues("spring.cloud.polaris.stat.pushgateway.service=test-service") .withPropertyValues("spring.cloud.polaris.stat.pushgateway.override-host=127.0.0.1") .withPropertyValues("spring.application.name=test") - .withPropertyValues("spring.cloud.gateway.enabled=false"); + .withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false"); private final ApplicationContextRunner disabledContextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(TestApplication.class)) .withPropertyValues("spring.cloud.polaris.enabled=true") .withPropertyValues("spring.cloud.polaris.stat.enabled=false") .withPropertyValues("spring.application.name=test") - .withPropertyValues("spring.cloud.gateway.enabled=false"); + .withPropertyValues("spring.cloud.gateway.server.webflux.enabled=false"); @BeforeEach void setUp() {