Merge branch 'refs/heads/dev/2024' into dev/2024-lb

# Conflicts:
#	spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancerClientConfiguration.java

pom.xml

@@ -90,7 +90,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>2.0.3.0-2024.0.1-SNAPSHOT</revision>
+		<revision>2.1.0.0-2024.0.1-SNAPSHOT</revision>
 
 		<!-- Spring Framework -->
 		<spring.framework.version>6.2.8</spring.framework.version>

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancerClientConfiguration.java

@@ -98,7 +98,6 @@ public class PolarisLoadBalancerClientConfiguration {
 		return new PolarisRingHashLoadBalancer(name,
 				loadBalancerClientFactory.getLazyProvider(name, ServiceInstanceListSupplier.class), polarisSDKContextManager.getRouterAPI());
 	}
-
 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(PolarisShortestResponseTimeStrategyCondition.class)
@@ -118,7 +117,6 @@ public class PolarisLoadBalancerClientConfiguration {
 		return new PolarisLeastConnectionLoadBalancer(name,
 				loadBalancerClientFactory.getLazyProvider(name, ServiceInstanceListSupplier.class), polarisSDKContextManager.getRouterAPI());
 	}
-
 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(DefaultStrategyCondition.class)
@@ -160,6 +158,7 @@ public class PolarisLoadBalancerClientConfiguration {
 		}
 	}
 
+
 	static class DefaultStrategyCondition implements Condition {
 
 		@Override

spring-cloud-tencent-dependencies/pom.xml

@@ -71,10 +71,10 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>2.0.3.0-2024.0.1-SNAPSHOT</revision>
+		<revision>2.1.0.0-2024.0.1-SNAPSHOT</revision>
 
 		<!-- Polaris SDK version -->
-		<polaris.version>2.0.3.0-SNAPSHOT</polaris.version>
+		<polaris.version>2.1.0.0-SNAPSHOT</polaris.version>
 
 		<!-- Dependencies -->
 		<springdoc.version>2.2.0</springdoc.version>