fix: try to fix maven config

pull/1350/head
fuyuwei01 1 year ago
parent dda2aacd94
commit 1e3bb3e9ec

@ -17,10 +17,10 @@
package com.tencent.cloud.polaris.tsf; package com.tencent.cloud.polaris.tsf;
import jakarta.validation.constraints.DecimalMax; import javax.validation.constraints.DecimalMax;
import jakarta.validation.constraints.DecimalMin; import javax.validation.constraints.DecimalMin;
import jakarta.validation.constraints.Min; import javax.validation.constraints.Min;
import jakarta.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.joda.time.Period; import org.joda.time.Period;

@ -22,7 +22,7 @@ import com.tencent.cloud.polaris.context.tsf.ConditionalOnTsfEnabled;
import com.tencent.cloud.polaris.registry.PolarisServiceRegistryAutoConfiguration; import com.tencent.cloud.polaris.registry.PolarisServiceRegistryAutoConfiguration;
import com.tencent.cloud.polaris.tsf.TsfDiscoveryProperties; import com.tencent.cloud.polaris.tsf.TsfDiscoveryProperties;
import com.tencent.cloud.polaris.tsf.TsfHeartbeatProperties; import com.tencent.cloud.polaris.tsf.TsfHeartbeatProperties;
import jakarta.servlet.ServletContext; import javax.servlet.ServletContext;
import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.AutoConfigureBefore;

@ -26,7 +26,7 @@ import com.tencent.cloud.common.util.JacksonUtils;
import com.tencent.cloud.polaris.registry.PolarisRegistration; import com.tencent.cloud.polaris.registry.PolarisRegistration;
import com.tencent.cloud.polaris.registry.PolarisRegistrationCustomizer; import com.tencent.cloud.polaris.registry.PolarisRegistrationCustomizer;
import com.tencent.polaris.plugins.connector.common.constant.ConsulConstant; 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.beans.factory.ObjectProvider;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;

@ -78,10 +78,10 @@
<!-- Dependencies --> <!-- Dependencies -->
<guava.version>32.0.1-jre</guava.version> <guava.version>32.0.1-jre</guava.version>
<springdoc.version>2.2.0</springdoc.version> <springdoc.version>1.7.0</springdoc.version>
<mocktio.version>4.9.0</mocktio.version> <mocktio.version>4.9.0</mocktio.version>
<byte-buddy.version>1.12.19</byte-buddy.version> <byte-buddy.version>1.12.19</byte-buddy.version>
<jackson.version>2.15.3</jackson.version> <jackson.version>2.13.5</jackson.version>
<protobuf-java.version>3.21.7</protobuf-java.version> <protobuf-java.version>3.21.7</protobuf-java.version>
<okio.version>3.0.0</okio.version> <okio.version>3.0.0</okio.version>
<joda-time.version>2.9.9</joda-time.version> <joda-time.version>2.9.9</joda-time.version>
@ -222,13 +222,13 @@
<dependency> <dependency>
<groupId>org.springdoc</groupId> <groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> <artifactId>springdoc-openapi-webflux-ui</artifactId>
<version>${springdoc.version}</version> <version>${springdoc.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springdoc</groupId> <groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId> <artifactId>springdoc-openapi-ui</artifactId>
<version>${springdoc.version}</version> <version>${springdoc.version}</version>
</dependency> </dependency>

@ -24,7 +24,7 @@ import java.net.SocketException;
import java.util.Enumeration; import java.util.Enumeration;
import com.tencent.cloud.tsf.demo.provider.config.ProviderNameConfig; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

@ -7,6 +7,8 @@ spring:
import: optional:polaris import: optional:polaris
cloud: cloud:
polaris: polaris:
config:
address: grpc://127.0.0.1:8091
namespace: default namespace: default
enabled: true enabled: true
stat: stat:

@ -109,6 +109,14 @@
<groupId>com.tencent.polaris</groupId> <groupId>com.tencent.polaris</groupId>
<artifactId>polaris-assembly-factory</artifactId> <artifactId>polaris-assembly-factory</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.tencent.polaris</groupId>
<artifactId>polaris-ratelimit-factory</artifactId>
</dependency>
<dependency>
<groupId>com.tencent.polaris</groupId>
<artifactId>polaris-circuitbreaker-factory</artifactId>
</dependency>
<!-- Polaris dependencies end --> <!-- Polaris dependencies end -->
<dependency> <dependency>

@ -18,7 +18,7 @@
package com.tencent.cloud.polaris.context.tsf.consul; 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.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;

Loading…
Cancel
Save