From 6f759cdcf443e36b32e1c1d3d9fd9ca41cc0f4fb Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Fri, 30 Jul 2021 20:19:51 +0800 Subject: [PATCH 1/9] docs:add workflow of test --- .github/workflows/maven.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 000000000..3adf3bba5 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,28 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Java CI with Maven + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Checkout codes + uses: actions/checkout@v2 + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + - name: Build with Maven + run: mvn -B package --file pom.xml + - name: Test with Maven + run: mvn test From 48456cbb831f4bf272e1545f2a22016a6316a3a8 Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Fri, 30 Jul 2021 20:20:42 +0800 Subject: [PATCH 2/9] docs:update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dc0534f66..848bb04f5 100644 --- a/README.md +++ b/README.md @@ -62,12 +62,12 @@ Example List: ### Version Standard -Adopt a version policy related to Spring Cloud's major version number +We use a version policy related to Spring Cloud's major version number. -Project version includes major version. minor version. patch version. Correspond with the version of Spring Cloud release. -major version. minor version. patch version are in numbers, start from 0. This project is in the incubating phase, major version number is set to 0. -Spring Cloud's version number is the same as the English version number, like Hoxton, Greenwich. -Release type will include RELEASE, RC, BETA. +Project version includes ```${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.${CORRESPONDING_VERSION_OF_SPRING_CLOUD}.${RELEASE_TYPE}```. +```${MAJOR_VERSION}```, ```${MINOR_VERSION}```, ```${PATCH_VERSION}``` are in numbers starting from 0. This project is in the incubating phase, so the major version is set to 0. +```${CORRESPONDING_VERSION_OF_SPRING_CLOUD}``` is the same as the version number of Spring Cloud, like Hoxton, Greenwich. +```${RELEASE_TYPE}``` will be like RELEASE, RC and BETA. For example: 0.1.0.Hoxton.BETA From a2ff5e3691df844a4f78594169069c52bcc78586 Mon Sep 17 00:00:00 2001 From: SkyeBeFreeman <928016560@qq.com> Date: Tue, 3 Aug 2021 15:30:09 +0800 Subject: [PATCH 3/9] docs:update Version Standard of README.md and fix maven dependencies bug. --- Code-of-Conduct.md | 2 +- README-zh.md | 10 +++++----- README.md | 10 +++++----- pom.xml | 2 +- .../spring-cloud-tencent-commons/pom.xml | 8 +------- 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/Code-of-Conduct.md b/Code-of-Conduct.md index 9212b41b6..2a9e8e351 100644 --- a/Code-of-Conduct.md +++ b/Code-of-Conduct.md @@ -3,4 +3,4 @@ Spring Cloud Tencent follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Spring Cloud Tencent Code of Conduct Committee via email: SpringCloudTencent_Community@qq.com \ No newline at end of file +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Spring Cloud Tencent Code of Conduct Committee via email: SpringCloudTencent@tencent.com \ No newline at end of file diff --git a/README-zh.md b/README-zh.md index bd80849f1..468ceba3b 100644 --- a/README-zh.md +++ b/README-zh.md @@ -62,12 +62,12 @@ Example 列表： 采取与Spring Cloud大版本号相关的版本策略。 -项目的版本号格式为 ```大版本号.小版本号.补丁版本号.对应Spring Cloud版本号.发布类型``` 的形式。 -大版本号、小版本号、补丁版本号的类型为数字，从 0 开始取值。项目处于孵化器阶段时，大版本号固定使用 0 。 -对应Spring Cloud版本号为Spring Cloud提供的英文版本号，例如Hoxton、Greenwich等。 -发布类型包括正式发布（RELEASE）、最终测试版（RC）、测试版（BETA）。 +项目的版本号格式为 ```大版本号.小版本号.补丁版本号.对应Spring Cloud的大版本号.对应Spring Cloud的小版本号-发布类型``` 的形式。 +大版本号、小版本号、补丁版本号的类型为数字，从 0 开始取值。 +对应Spring Cloud的大版本号为Spring Cloud提供的英文版本号，例如Hoxton、Greenwich等。对应Spring Cloud的小版本号为Spring Cloud给出的小版本号，例如 RS9 等。 +发布类型目前包括正式发布和发布候选版（RC）。在实际的版本号中，正式发布版不额外添加发布类型，发布候选版将添加后缀，并从 RC0 开始。 -示例：0.1.0.Hoxton.BETA +示例：1.0.0.Hoxton.SR9-RC0 ## License The spring-cloud-tencent is licensed under the BSD 3-Clause License. Copyright and license information can be found in the file [LICENSE](LICENSE) diff --git a/README.md b/README.md index 848bb04f5..c8d123e22 100644 --- a/README.md +++ b/README.md @@ -64,12 +64,12 @@ Example List: We use a version policy related to Spring Cloud's major version number. -Project version includes ```${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.${CORRESPONDING_VERSION_OF_SPRING_CLOUD}.${RELEASE_TYPE}```. -```${MAJOR_VERSION}```, ```${MINOR_VERSION}```, ```${PATCH_VERSION}``` are in numbers starting from 0. This project is in the incubating phase, so the major version is set to 0. -```${CORRESPONDING_VERSION_OF_SPRING_CLOUD}``` is the same as the version number of Spring Cloud, like Hoxton, Greenwich. -```${RELEASE_TYPE}``` will be like RELEASE, RC and BETA. +Project version includes ```${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.${CORRESPONDING_MAJOR_VERSION_OF_SPRING_CLOUD}.${CORRESPONDING_MINOR_VERSION_OF_SPRING_CLOUD}-${RELEASE_TYPE}```. +```${MAJOR_VERSION}```, ```${MINOR_VERSION}```, ```${PATCH_VERSION}``` are in numbers starting from 0. +```${CORRESPONDING_MAJOR_VERSION_OF_SPRING_CLOUD}``` is the same as the major version number of Spring Cloud, like Hoxton, Greenwich. ```${CORRESPONDING_MINOR_VERSION_OF_SPRING_CLOUD}``` is the same as the major version number of Spring Cloud, like RS9. +```${RELEASE_TYPE}``` is like RELEASE or RC currently. Actually, the RELEASE version does not add a release type in the version, and the RS version will add a suffix and start from RC0. -For example: 0.1.0.Hoxton.BETA +For example: 1.0.0.Hoxton.SR9-RC0 ## License The spring-cloud-tencent is licensed under the BSD 3-Clause License. Copyright and license information can be found in the file [LICENSE](LICENSE) diff --git a/pom.xml b/pom.xml index c22b6d0e3..f60bd7014 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ - 0.1.0.Hoxton.BETA + 1.0.0.Hoxton.SR9 Hoxton.SR9 diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml index 8169ff482..5975fed2b 100644 --- a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml @@ -16,7 +16,7 @@ 3.2.2 2.5 - 2.6 + 2.7 @@ -56,12 +56,6 @@ commons-io ${commons.io.version} - - - com.google.guava - guava - 28.0-jre - \ No newline at end of file From eb7cdf56b230e190785410212a9852cdef1371e5 Mon Sep 17 00:00:00 2001 From: SkyeBeFreeman <928016560@qq.com> Date: Tue, 3 Aug 2021 20:28:36 +0800 Subject: [PATCH 4/9] docs:update pom.xml for deploying to Maven Central --- pom.xml | 99 +++++++++++++------ .../pom.xml | 8 +- spring-cloud-tencent-dependencies/pom.xml | 4 +- spring-cloud-tencent-docs/pom.xml | 4 + spring-cloud-tencent-examples/pom.xml | 4 + 5 files changed, 87 insertions(+), 32 deletions(-) rename {spring-cloud-tencent-converage => spring-cloud-tencent-coverage}/pom.xml (92%) diff --git a/pom.xml b/pom.xml index f60bd7014..c0dd6ac81 100644 --- a/pom.xml +++ b/pom.xml @@ -19,18 +19,25 @@ - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt + The BSD 3-Clause License (BSD3) + https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/main/LICENSE repo + + https://github.com/Tencent/spring-cloud-tencent + scm:git:git@github.com:Tencent/spring-cloud-tencent.git + scm:git:git@github.com:Tencent/spring-cloud-tencent.git + + + spring-cloud-tencent-dependencies spring-cloud-tencent-starters spring-cloud-tencent-examples spring-cloud-tencent-docs - spring-cloud-tencent-converage + spring-cloud-tencent-coverage @@ -120,31 +127,6 @@ false - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - attach-sources - - jar - - - - org.codehaus.mojo flatten-maven-plugin @@ -172,4 +154,65 @@ + + + + release + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + verify + + sign + + + + + + + + + + nexus-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + nexus-releases + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + \ No newline at end of file diff --git a/spring-cloud-tencent-converage/pom.xml b/spring-cloud-tencent-coverage/pom.xml similarity index 92% rename from spring-cloud-tencent-converage/pom.xml rename to spring-cloud-tencent-coverage/pom.xml index 6649d2c13..6a6ac41c5 100644 --- a/spring-cloud-tencent-converage/pom.xml +++ b/spring-cloud-tencent-coverage/pom.xml @@ -10,8 +10,12 @@ 4.0.0 - spring-cloud-tencent-converage - Spring Cloud Tencent Converage + spring-cloud-tencent-coverage + Spring Cloud Tencent Coverage + + + true + diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 88cee1867..b36402a6e 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -12,13 +12,13 @@ com.tencent.cloud spring-cloud-tencent-dependencies - 0.1.0.Hoxton.BETA + ${revision} pom Spring Cloud Tencent Dependencies Spring Cloud Tencent Dependencies - 0.0.1-SNAPSHOT + 1.0.0.Hoxton.SR9 0.8.0-SNAPSHOT 10.0.0-M6 2.0.0 diff --git a/spring-cloud-tencent-docs/pom.xml b/spring-cloud-tencent-docs/pom.xml index 5fab38bee..1e53f0d74 100644 --- a/spring-cloud-tencent-docs/pom.xml +++ b/spring-cloud-tencent-docs/pom.xml @@ -14,4 +14,8 @@ Spring Cloud Tencent Documentation pom + + true + + \ No newline at end of file diff --git a/spring-cloud-tencent-examples/pom.xml b/spring-cloud-tencent-examples/pom.xml index 2bf49d9ff..d2d05641b 100644 --- a/spring-cloud-tencent-examples/pom.xml +++ b/spring-cloud-tencent-examples/pom.xml @@ -21,4 +21,8 @@ polaris-circuitbreaker-example + + true + + \ No newline at end of file From 11108962c189622aea0e91a6344bc9da69f45134 Mon Sep 17 00:00:00 2001 From: SkyeBeFreeman <928016560@qq.com> Date: Wed, 4 Aug 2021 10:18:46 +0800 Subject: [PATCH 5/9] docs:update developer --- pom.xml | 14 +++++++++++++- spring-cloud-tencent-dependencies/pom.xml | 2 +- .../tencent/cloud/polaris/PolarisProperties.java | 2 +- .../cloud/polaris/client/PolarisClient.java | 2 +- .../ConditionalOnPolarisDiscoveryEnabled.java | 2 +- .../PolarisDiscoveryAutoConfiguration.java | 2 +- .../polaris/discovery/PolarisDiscoveryClient.java | 2 +- .../PolarisDiscoveryClientConfiguration.java | 2 +- .../polaris/discovery/PolarisDiscoveryHandler.java | 2 +- .../polaris/discovery/PolarisServiceDiscovery.java | 2 +- .../reactive/PolarisReactiveDiscoveryClient.java | 2 +- ...olarisReactiveDiscoveryClientConfiguration.java | 2 +- .../registry/PolarisAutoServiceRegistration.java | 2 +- .../polaris/registry/PolarisRegistration.java | 2 +- .../polaris/registry/PolarisServiceRegistry.java | 2 +- .../PolarisServiceRegistryAutoConfiguration.java | 2 +- .../PolarisDiscoveryRibbonAutoConfiguration.java | 2 +- .../PolarisRibbonServerListConfiguration.java | 2 +- .../cloud/polaris/ribbon/PolarisServerList.java | 2 +- 19 files changed, 31 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index c0dd6ac81..baa77555b 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,18 @@ Tencent https://github.com/SkyeBeFreeman/ + + Andrew Shan + samshan08@126.com + Tencent + + + xiaoyao1999hn + Jie Cheng + 348893717@qq.com + Tencent + https://github.com/xiaoyao1999hn/ + @@ -58,7 +70,7 @@ Hoxton.SR9 - 0.8.0-SNAPSHOT + 1.0.0-SNAPSHOT 0.8.3 diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index b36402a6e..e43bd492e 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -19,7 +19,7 @@ 1.0.0.Hoxton.SR9 - 0.8.0-SNAPSHOT + 1.0.0-SNAPSHOT 10.0.0-M6 2.0.0 diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisProperties.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisProperties.java index 3d6f2c426..8ff171ab2 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisProperties.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisProperties.java @@ -27,7 +27,7 @@ import org.springframework.core.env.Environment; /** * Properties for Polaris. * - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ @ConfigurationProperties("spring.cloud.polaris.discovery") public class PolarisProperties { diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java index 763fafeb7..102b20a7a 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java @@ -27,7 +27,7 @@ import java.lang.annotation.Target; /** * Annotation for Polaris Client for service configuration. * - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/ConditionalOnPolarisDiscoveryEnabled.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/ConditionalOnPolarisDiscoveryEnabled.java index 84b612f8a..d0829df6e 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/ConditionalOnPolarisDiscoveryEnabled.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/ConditionalOnPolarisDiscoveryEnabled.java @@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled; /** - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE, ElementType.METHOD}) diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryAutoConfiguration.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryAutoConfiguration.java index a46908b34..38d0cb10d 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryAutoConfiguration.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryAutoConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Import; /** * Discovery Auto Configuration for Polaris. * - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ @Configuration(proxyBeanMethods = false) @ConditionalOnPolarisDiscoveryEnabled diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClient.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClient.java index aea0c115e..eaa555e9e 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClient.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClient.java @@ -26,7 +26,7 @@ import org.springframework.cloud.client.discovery.DiscoveryClient; /** * Discovery Client for Polaris. * - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ public class PolarisDiscoveryClient implements DiscoveryClient { diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClientConfiguration.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClientConfiguration.java index 01ad501a9..a788d2b59 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClientConfiguration.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClientConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration; /** * Discovery Client Configuration for Polaris. * - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ @Configuration(proxyBeanMethods = false) @ConditionalOnBlockingDiscoveryEnabled diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java index 878b3fd5b..b765a36a5 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java @@ -34,7 +34,7 @@ import org.springframework.stereotype.Component; /** * Discovery Handler for Polaris. * - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ @Component public class PolarisDiscoveryHandler { diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java index ebb93df17..c06c3307a 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java @@ -29,7 +29,7 @@ import java.util.List; import org.springframework.cloud.client.ServiceInstance; /** - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ public class PolarisServiceDiscovery { diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/reactive/PolarisReactiveDiscoveryClient.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/reactive/PolarisReactiveDiscoveryClient.java index 48746dfe4..b316f5d86 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/reactive/PolarisReactiveDiscoveryClient.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/reactive/PolarisReactiveDiscoveryClient.java @@ -32,7 +32,7 @@ import reactor.core.scheduler.Schedulers; /** * Reactive Discovery Client for Polaris. * - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ public class PolarisReactiveDiscoveryClient implements ReactiveDiscoveryClient { diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/reactive/PolarisReactiveDiscoveryClientConfiguration.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/reactive/PolarisReactiveDiscoveryClientConfiguration.java index 183e15783..77a62343c 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/reactive/PolarisReactiveDiscoveryClientConfiguration.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/reactive/PolarisReactiveDiscoveryClientConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration; /** * Reactive Discovery Client Configuration for Polaris. * - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ @Configuration(proxyBeanMethods = false) @ConditionalOnReactiveDiscoveryEnabled diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistration.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistration.java index d32b20d99..9b33854f0 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistration.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistration.java @@ -26,7 +26,7 @@ import org.springframework.cloud.client.serviceregistry.ServiceRegistry; import org.springframework.util.StringUtils; /** - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ public class PolarisAutoServiceRegistration extends AbstractAutoServiceRegistration { diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java index 3dcc05d04..b76b12359 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java @@ -28,7 +28,7 @@ import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.serviceregistry.Registration; /** - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ public class PolarisRegistration implements Registration, ServiceInstance { diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java index 5dc4814f6..d99f30b9b 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java @@ -41,7 +41,7 @@ import org.springframework.cloud.client.serviceregistry.ServiceRegistry; import org.springframework.util.StringUtils; /** - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ public class PolarisServiceRegistry implements ServiceRegistry { diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryAutoConfiguration.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryAutoConfiguration.java index 157e60bec..85816e618 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryAutoConfiguration.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisDiscoveryRibbonAutoConfiguration.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisDiscoveryRibbonAutoConfiguration.java index ff123f9a7..869c73281 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisDiscoveryRibbonAutoConfiguration.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisDiscoveryRibbonAutoConfiguration.java @@ -25,7 +25,7 @@ import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.context.annotation.Configuration; /** - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisRibbonServerListConfiguration.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisRibbonServerListConfiguration.java index f612b0e11..74efa1320 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisRibbonServerListConfiguration.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisRibbonServerListConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ @Configuration public class PolarisRibbonServerListConfiguration { diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisServerList.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisServerList.java index b52fd6b79..7ae86665b 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisServerList.java +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/ribbon/PolarisServerList.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author Haotian Zhang + * @author Haotian Zhang, Andrew Shan, Jie Cheng */ public class PolarisServerList extends AbstractServerList { From 5795c10e47512def1698132bc10711ea9492c1c3 Mon Sep 17 00:00:00 2001 From: SkyeBeFreeman <928016560@qq.com> Date: Wed, 4 Aug 2021 10:20:30 +0800 Subject: [PATCH 6/9] docs:update dependency --- spring-cloud-tencent-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index e43bd492e..e37e86462 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -33,7 +33,7 @@ polaris-dependencies - com.tencent.nameservice + com.tencent.polaris ${polaris.version} pom import From b9563fd0ae8930a29760f48afb717797b4e43bf8 Mon Sep 17 00:00:00 2001 From: SkyeBeFreeman <928016560@qq.com> Date: Wed, 4 Aug 2021 10:43:25 +0800 Subject: [PATCH 7/9] docs:update dependency --- .github/workflows/maven.yml | 6 ++--- mvnw | 0 .../pom.xml | 4 ++-- .../pom.xml | 6 ++--- .../pom.xml | 6 ++--- .../pom.xml | 4 ++-- .../spring-cloud-tencent-commons/pom.xml | 2 +- .../pom.xml | 24 +++++++++---------- 8 files changed, 26 insertions(+), 26 deletions(-) mode change 100644 => 100755 mvnw diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3adf3bba5..3e05a1be3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -22,7 +22,7 @@ jobs: with: java-version: '8' distribution: 'adopt' - - name: Build with Maven - run: mvn -B package --file pom.xml +# - name: Build with Maven +# run: mvn -B package --file pom.xml - name: Test with Maven - run: mvn test + run: mvn -B test --file pom.xml diff --git a/mvnw b/mvnw old mode 100644 new mode 100755 diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml index 6d03a4195..1c827dabd 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml @@ -27,12 +27,12 @@ - com.tencent.nameservice + com.tencent.polaris polaris-discovery-factory - com.tencent.nameservice + com.tencent.polaris polaris-circuitbreaker-factory diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml index b24a9b009..56f6d849b 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml @@ -37,18 +37,18 @@ - com.tencent.nameservice + com.tencent.polaris polaris-discovery-factory - com.tencent.nameservice + com.tencent.polaris polaris-test-common test - com.tencent.nameservice + com.tencent.polaris polaris-test-mock-discovery test diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml index 544a4360a..c669a88c1 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml @@ -33,19 +33,19 @@ - com.tencent.nameservice + com.tencent.polaris polaris-factory - com.tencent.nameservice + com.tencent.polaris polaris-test-common test true - com.tencent.nameservice + com.tencent.polaris polaris-test-mock-discovery test true diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/pom.xml b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/pom.xml index bdac01d1b..93cda9a4c 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/pom.xml @@ -33,12 +33,12 @@ - com.tencent.nameservice + com.tencent.polaris polaris-router-factory - com.tencent.nameservice + com.tencent.polaris polaris-test-common test diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml index 5975fed2b..8769a16a5 100644 --- a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml @@ -22,7 +22,7 @@ - com.tencent.nameservice + com.tencent.polaris polaris-model diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-context/pom.xml b/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-context/pom.xml index 07087fdde..7cb4611e0 100644 --- a/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-context/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-context/pom.xml @@ -23,66 +23,66 @@ - com.tencent.nameservice + com.tencent.polaris polaris-client - com.tencent.nameservice + com.tencent.polaris polaris-plugin-api - com.tencent.nameservice + com.tencent.polaris connector-polaris-grpc - com.tencent.nameservice + com.tencent.polaris resource-cache-memory - com.tencent.nameservice + com.tencent.polaris flow-cache-expired - com.tencent.nameservice + com.tencent.polaris router-isolated - com.tencent.nameservice + com.tencent.polaris router-healthy - com.tencent.nameservice + com.tencent.polaris router-rule - com.tencent.nameservice + com.tencent.polaris router-nearby - com.tencent.nameservice + com.tencent.polaris router-metadata - com.tencent.nameservice + com.tencent.polaris loadbalancer-random - com.tencent.nameservice + com.tencent.polaris loadbalancer-ringhash From 215cc1cd0afe86bc2801da95ea607faa9090e3ea Mon Sep 17 00:00:00 2001 From: SkyeBeFreeman <928016560@qq.com> Date: Fri, 6 Aug 2021 09:06:55 +0800 Subject: [PATCH 8/9] docs:update developer --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index baa77555b..c22e92411 100644 --- a/pom.xml +++ b/pom.xml @@ -48,11 +48,13 @@ Tencent https://github.com/SkyeBeFreeman/ + Andrew Shan samshan08@126.com Tencent + xiaoyao1999hn Jie Cheng From 30227f6d229ea4172e841367c6fcae1ea07c0a1b Mon Sep 17 00:00:00 2001 From: SkyeBeFreeman <928016560@qq.com> Date: Fri, 6 Aug 2021 09:11:14 +0800 Subject: [PATCH 9/9] docs:update polaris version --- spring-cloud-tencent-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index e37e86462..fc0092f58 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -19,7 +19,7 @@ 1.0.0.Hoxton.SR9 - 1.0.0-SNAPSHOT + 1.0.0 10.0.0-M6 2.0.0