From 1e3bb3e9ec011e5655c6a99281fe739016f06bc8 Mon Sep 17 00:00:00 2001 From: fuyuwei01 Date: Fri, 19 Jul 2024 11:47:10 +0800 Subject: [PATCH] fix: try to fix maven config --- .../tencent/cloud/polaris/tsf/TsfHeartbeatProperties.java | 8 ++++---- .../registry/TsfDiscoveryRegistryAutoConfiguration.java | 2 +- .../tsf/registry/TsfServletRegistrationCustomizer.java | 2 +- spring-cloud-tencent-dependencies/pom.xml | 8 ++++---- .../cloud/tsf/demo/provider/ProviderController.java | 2 +- .../provider-demo/src/main/resources/application.yml | 2 ++ spring-cloud-tencent-polaris-context/pom.xml | 8 ++++++++ .../polaris/context/tsf/consul/TsfConsulProperties.java | 2 +- 8 files changed, 22 insertions(+), 12 deletions(-) diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/TsfHeartbeatProperties.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/TsfHeartbeatProperties.java index 895e90761..aeb613ff4 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/TsfHeartbeatProperties.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/TsfHeartbeatProperties.java @@ -17,10 +17,10 @@ package com.tencent.cloud.polaris.tsf; -import jakarta.validation.constraints.DecimalMax; -import jakarta.validation.constraints.DecimalMin; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import org.apache.commons.logging.Log; import org.joda.time.Period; diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/registry/TsfDiscoveryRegistryAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/registry/TsfDiscoveryRegistryAutoConfiguration.java index 461b1e05b..548f1eda6 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/registry/TsfDiscoveryRegistryAutoConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/registry/TsfDiscoveryRegistryAutoConfiguration.java @@ -22,7 +22,7 @@ import com.tencent.cloud.polaris.context.tsf.ConditionalOnTsfEnabled; import com.tencent.cloud.polaris.registry.PolarisServiceRegistryAutoConfiguration; import com.tencent.cloud.polaris.tsf.TsfDiscoveryProperties; import com.tencent.cloud.polaris.tsf.TsfHeartbeatProperties; -import jakarta.servlet.ServletContext; +import javax.servlet.ServletContext; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigureBefore; diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/registry/TsfServletRegistrationCustomizer.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/registry/TsfServletRegistrationCustomizer.java index 75b05a445..0233efa16 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/registry/TsfServletRegistrationCustomizer.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/tsf/registry/TsfServletRegistrationCustomizer.java @@ -26,7 +26,7 @@ import com.tencent.cloud.common.util.JacksonUtils; import com.tencent.cloud.polaris.registry.PolarisRegistration; import com.tencent.cloud.polaris.registry.PolarisRegistrationCustomizer; import com.tencent.polaris.plugins.connector.common.constant.ConsulConstant; -import jakarta.servlet.ServletContext; +import javax.servlet.ServletContext; import org.springframework.beans.factory.ObjectProvider; import org.springframework.util.StringUtils; diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 1a5ebf5ca..f03e4372d 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -78,10 +78,10 @@ 32.0.1-jre - 2.2.0 + 1.7.0 4.9.0 1.12.19 - 2.15.3 + 2.13.5 3.21.7 3.0.0 2.9.9 @@ -222,13 +222,13 @@ org.springdoc - springdoc-openapi-starter-webmvc-ui + springdoc-openapi-webflux-ui ${springdoc.version} org.springdoc - springdoc-openapi-starter-webflux-ui + springdoc-openapi-ui ${springdoc.version} diff --git a/spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/java/com/tencent/cloud/tsf/demo/provider/ProviderController.java b/spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/java/com/tencent/cloud/tsf/demo/provider/ProviderController.java index 4d56ed3aa..2a5f52b77 100644 --- a/spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/java/com/tencent/cloud/tsf/demo/provider/ProviderController.java +++ b/spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/java/com/tencent/cloud/tsf/demo/provider/ProviderController.java @@ -24,7 +24,7 @@ import java.net.SocketException; import java.util.Enumeration; import com.tencent.cloud.tsf.demo.provider.config.ProviderNameConfig; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/resources/application.yml b/spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/resources/application.yml index d4ae0231b..fe4e61657 100644 --- a/spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/resources/application.yml +++ b/spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/resources/application.yml @@ -7,6 +7,8 @@ spring: import: optional:polaris cloud: polaris: + config: + address: grpc://127.0.0.1:8091 namespace: default enabled: true stat: diff --git a/spring-cloud-tencent-polaris-context/pom.xml b/spring-cloud-tencent-polaris-context/pom.xml index 7c940815f..38a08f7e4 100644 --- a/spring-cloud-tencent-polaris-context/pom.xml +++ b/spring-cloud-tencent-polaris-context/pom.xml @@ -109,6 +109,14 @@ com.tencent.polaris polaris-assembly-factory + + com.tencent.polaris + polaris-ratelimit-factory + + + com.tencent.polaris + polaris-circuitbreaker-factory + diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/consul/TsfConsulProperties.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/consul/TsfConsulProperties.java index 6cce59a42..334b14f85 100644 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/consul/TsfConsulProperties.java +++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/consul/TsfConsulProperties.java @@ -18,7 +18,7 @@ package com.tencent.cloud.polaris.context.tsf.consul; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated;