From bcb4cfd089e3531fb55686c02ea6fefb3696d912 Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Tue, 13 Sep 2022 16:59:16 +0800 Subject: [PATCH 1/3] release:release 1.7.1-Hoxton.SR12. (#587) --- README-zh.md | 2 +- README.md | 2 +- pom.xml | 2 +- spring-cloud-tencent-dependencies/pom.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README-zh.md b/README-zh.md index c2c01f16f..3d854a349 100644 --- a/README-zh.md +++ b/README-zh.md @@ -70,7 +70,7 @@ Spring Cloud Tencent 所有组件都已上传到 Maven 中央仓库，只需要 com.tencent.cloud spring-cloud-tencent-dependencies - 1.7.0-Hoxton.SR12 + 1.7.1-Hoxton.SR12 pom import diff --git a/README.md b/README.md index b5edf33e0..7fb3aa769 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ For example: com.tencent.cloud spring-cloud-tencent-dependencies - 1.7.0-Hoxton.SR12 + 1.7.1-Hoxton.SR12 pom import diff --git a/pom.xml b/pom.xml index f8c2ab336..7da80d479 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ - 1.7.1-Hoxton.SR12-SNAPSHOT + 1.7.1-Hoxton.SR12 Hoxton.SR12 diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index e6314c22b..621cc49bc 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -70,8 +70,8 @@ - 1.7.1-Hoxton.SR12-SNAPSHOT - 1.7.4-SNAPSHOT + 1.7.1-Hoxton.SR12 + 1.7.4 1.2.11 4.5.1 1.12.10 From a8e230a39b3f01a45afbd7169dfeb2f1601f67b8 Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Wed, 14 Sep 2022 16:48:38 +0800 Subject: [PATCH 2/3] begin 1.8.0-Hoxton.SR12-SNAPSHOT. (#592) --- .github/PULL_REQUEST_TEMPLATE.md | 4 +-- .github/workflows/codecov.yml | 7 ++--- .github/workflows/junit_test.yml | 36 +++++++++++------------ CHANGELOG.md | 29 ------------------ README-zh.md | 4 +-- README.md | 4 +-- changes/changes-1.7.1.md | 32 ++++++++++++++++++++ pom.xml | 6 ++-- spring-cloud-tencent-dependencies/pom.xml | 8 ++--- 9 files changed, 65 insertions(+), 65 deletions(-) create mode 100644 changes/changes-1.7.1.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b162ac3a2..b89266620 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,5 @@ ## PR Type + - 1.7.1-Hoxton.SR12 + 1.8.0-Hoxton.SR12-SNAPSHOT Hoxton.SR12 diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 621cc49bc..5ea18c1db 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -16,7 +16,7 @@ pom Spring Cloud Tencent Dependencies Spring Cloud Tencent Dependencies - https://github.com/Tencent/spring-cloud-tencent/tree/main + https://github.com/Tencent/spring-cloud-tencent/tree/hoxton Tencent @@ -26,7 +26,7 @@ The BSD 3-Clause License (BSD3) - https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/main/LICENSE + https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/hoxton/LICENSE repo @@ -70,8 +70,8 @@ - 1.7.1-Hoxton.SR12 - 1.7.4 + 1.8.0-Hoxton.SR12-SNAPSHOT + 1.8.0-SNAPSHOT 1.2.11 4.5.1 1.12.10 From c3793183775f7d549f9f26ee2397ec6fe853c2f8 Mon Sep 17 00:00:00 2001 From: lepdou Date: Thu, 15 Sep 2022 11:54:30 +0800 Subject: [PATCH 3/3] remove discovery module useless code (#597) --- CHANGELOG.md | 1 + .../cloud/polaris/client/PolarisClient.java | 49 ------------------- ...itional-spring-configuration-metadata.json | 6 --- 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 06c1f8175..1e253d228 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ # Change Log --- +- [Optimize: remove discovery module useless code](https://github.com/Tencent/spring-cloud-tencent/pull/597) diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java deleted file mode 100644 index dddf5279b..000000000 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/client/PolarisClient.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making Spring Cloud Tencent available. - * - * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the BSD 3-Clause License (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://opensource.org/licenses/BSD-3-Clause - * - * Unless required by applicable law or agreed to in writing, software distributed - * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - * CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package com.tencent.cloud.polaris.client; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Annotation for Polaris Client for service configuration. - * - * @author Haotian Zhang, Andrew Shan, Jie Cheng - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Inherited -public @interface PolarisClient { - - /** - * Service name of instance. - * @return service - */ - String service() default ""; - - /** - * Namespace name of instance. - * @return namespace - */ - String namespace() default ""; -} diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 22f6e5363..115585d91 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -36,12 +36,6 @@ "defaultValue": "", "description": "heal check url." }, - { - "name": "spring.cloud.polaris.discovery.instance-enabled", - "type": "java.lang.Boolean", - "defaultValue": true, - "description": "If instance is enabled to accept request. The default value is true." - }, { "name": "spring.cloud.polaris.discovery.token", "type": "java.lang.String",