begin 1.11.1.

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,12 +21,10 @@ fixes #
 
 ## Checklist
 
-- [ ] Coverage from `Codecov Report` should not decrease (which means adding junit tests for adding or updating code).
-- [ ] All junit tests passing.
-- [ ] Add copyright holder at the beginning of .java file if it is new.
 - [ ] Add information of this PR to CHANGELOG.md in root of project.
+- [ ] Add documentation in javadoc or comment below the PR if necessary.
 
 ## Checklist (Optional)
 
-- [ ] Will Pull Request to branch of 2020.0 and hoxton.
-- [ ] Add documentation in javadoc or comment below the PR if necessary.
+- [ ] Will pull request to branch of 2020.0.
+- [ ] Will pull request to branch of 2022.0.

.github/workflows/codecov.yml

@@ -27,8 +27,9 @@ jobs:
           distribution: 'temurin'
           java-version: 8
       - name: Test with Maven
-        run: mvn -B test --file pom.xml
+        run: mvn clean test -f pom.xml -B -P sonatype -U
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
-          file: ${{ github.workspace }}/target/site/jacoco/jacoco.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ${{ github.workspace }}/target/site/jacoco/jacoco.xml

.github/workflows/junit_test.yml

@@ -42,4 +42,4 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Test with Maven
-        run: mvn -B test --file pom.xml
+        run: mvn clean test -f pom.xml -B -P sonatype -U

.github/workflows/license-checker.yml

@@ -0,0 +1,25 @@
+name: License checker
+
+on:
+  push:
+    branches:
+      - 2022.0
+      - 2021.0
+      - 2020.0
+      - hoxton
+      - greenwich
+  pull_request:
+    branches:
+      - 2022.0
+      - 2021.0
+      - 2020.0
+      - hoxton
+      - greenwich
+jobs:
+  check-license:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout codes
+        uses: actions/checkout@v3
+      - name: Check License Header
+        uses: apache/skywalking-eyes@v0.4.0

.licenserc.yaml

@@ -0,0 +1,23 @@
+header:
+  license:
+    content: |
+      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.
+  paths:
+    - "**/java/**"
+  language:
+    Java:
+      extensions:
+        - ".java"

CHANGELOG.md

@@ -1,26 +1,3 @@
 # Change Log
 ---
 
-- [Optimize:optimize spring value processor](https://github.com/Tencent/spring-cloud-tencent/pull/669)
-- [Optimize: Register the service with the ProviderAPI#registerInstance method.](https://github.com/Tencent/spring-cloud-tencent/pull/687)
-- [Optimize:optimize spring annotation.](https://github.com/Tencent/spring-cloud-tencent/pull/689)
-- [docs:update PR template.](https://github.com/Tencent/spring-cloud-tencent/pull/692)
-- [Code optimize & add junit tests.](https://github.com/Tencent/spring-cloud-tencent/pull/702)
-- [Test:support environment variable metadata test.](https://github.com/Tencent/spring-cloud-tencent/pull/711)
-- [upgrade protobuf-java.version to 3.21.7.](https://github.com/Tencent/spring-cloud-tencent/pull/717)
-- [docs:update README.](https://github.com/Tencent/spring-cloud-tencent/pull/720)
-- [Code optimization & correct comment](https://github.com/Tencent/spring-cloud-tencent/pull/724)
-- [fix:fix javadoc.](https://github.com/Tencent/spring-cloud-tencent/pull/727)
-- [fix:fix discovery junit.](https://github.com/Tencent/spring-cloud-tencent/pull/729)
-- [adapt polaris-java 1.10.1 version](https://github.com/Tencent/spring-cloud-tencent/pull/747)
-- [Optimize: change RouteArgument.buildCustom to RouteArgument.fromLabel](https://github.com/Tencent/spring-cloud-tencent/pull/751)
-- [Optimize: support delete config for ConfigurationProperties bean  ](https://github.com/Tencent/spring-cloud-tencent/pull/756)
-- [Feature: support nacos registry](https://github.com/Tencent/spring-cloud-tencent/pull/758)
-- [Test:add sct-stater-polaris-router junit.](https://github.com/Tencent/spring-cloud-tencent/pull/768)
-- [Optimize: add equals&hasCode for PolarisServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/773)
-- [Fix issue: prompt no registration if web dependence was not imported.](https://github.com/Tencent/spring-cloud-tencent/pull/778)
-- [fix:fix nacos enabled condition bugs.](https://github.com/Tencent/spring-cloud-tencent/pull/795)
-- [feat:update getPort method of PolarisRegistration.](https://github.com/Tencent/spring-cloud-tencent/pull/805)
-- [fix:fix some compile output issues.](https://github.com/Tencent/spring-cloud-tencent/pull/812)
-- [fix:nacos & polaris discovery](https://github.com/Tencent/spring-cloud-tencent/pull/820)
-- [fix:fix router parameter not checking bug.](https://github.com/Tencent/spring-cloud-tencent/pull/828)

changes/changes-1.9.0.md

@@ -0,0 +1,26 @@
+# Change Log
+---
+
+- [Optimize:optimize spring value processor](https://github.com/Tencent/spring-cloud-tencent/pull/669)
+- [Optimize: Register the service with the ProviderAPI#registerInstance method.](https://github.com/Tencent/spring-cloud-tencent/pull/687)
+- [Optimize:optimize spring annotation.](https://github.com/Tencent/spring-cloud-tencent/pull/689)
+- [docs:update PR template.](https://github.com/Tencent/spring-cloud-tencent/pull/692)
+- [Code optimize & add junit tests.](https://github.com/Tencent/spring-cloud-tencent/pull/702)
+- [Test:support environment variable metadata test.](https://github.com/Tencent/spring-cloud-tencent/pull/711)
+- [upgrade protobuf-java.version to 3.21.7.](https://github.com/Tencent/spring-cloud-tencent/pull/717)
+- [docs:update README.](https://github.com/Tencent/spring-cloud-tencent/pull/720)
+- [Code optimization & correct comment](https://github.com/Tencent/spring-cloud-tencent/pull/724)
+- [fix:fix javadoc.](https://github.com/Tencent/spring-cloud-tencent/pull/727)
+- [fix:fix discovery junit.](https://github.com/Tencent/spring-cloud-tencent/pull/729)
+- [adapt polaris-java 1.10.1 version](https://github.com/Tencent/spring-cloud-tencent/pull/747)
+- [Optimize: change RouteArgument.buildCustom to RouteArgument.fromLabel](https://github.com/Tencent/spring-cloud-tencent/pull/751)
+- [Optimize: support delete config for ConfigurationProperties bean  ](https://github.com/Tencent/spring-cloud-tencent/pull/756)
+- [Feature: support nacos registry](https://github.com/Tencent/spring-cloud-tencent/pull/758)
+- [Test:add sct-stater-polaris-router junit.](https://github.com/Tencent/spring-cloud-tencent/pull/768)
+- [Optimize: add equals&hasCode for PolarisServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/773)
+- [Fix issue: prompt no registration if web dependence was not imported.](https://github.com/Tencent/spring-cloud-tencent/pull/778)
+- [fix:fix nacos enabled condition bugs.](https://github.com/Tencent/spring-cloud-tencent/pull/795)
+- [feat:update getPort method of PolarisRegistration.](https://github.com/Tencent/spring-cloud-tencent/pull/805)
+- [fix:fix some compile output issues.](https://github.com/Tencent/spring-cloud-tencent/pull/812)
+- [fix:nacos & polaris discovery](https://github.com/Tencent/spring-cloud-tencent/pull/820)
+- [fix:fix router parameter not checking bug.](https://github.com/Tencent/spring-cloud-tencent/pull/828)

pom.xml

@@ -89,14 +89,17 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.9.0-Hoxton.SR12</revision>
-
-		<!-- Spring Cloud -->
-		<spring.cloud.version>Hoxton.SR12</spring.cloud.version>
+		<revision>1.11.1-Hoxton.SR12-SNAPSHOT</revision>
 
 		<!-- Spring Framework -->
 		<spring.framework.version>5.2.22.RELEASE</spring.framework.version>
 
+		<!-- Spring Boot -->
+		<spring.boot.version>2.3.12.RELEASE</spring.boot.version>
+
+		<!-- Spring Cloud -->
+		<spring.cloud.version>Hoxton.SR12</spring.cloud.version>
+
 		<!-- Maven Plugin Versions -->
 		<jacoco.version>0.8.8</jacoco.version>
 		<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
@@ -130,6 +133,15 @@
 				<scope>import</scope>
 			</dependency>
 
+			<!-- Spring Boot Dependencies -->
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>${spring.boot.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
 			<!-- Spring Cloud Dependencies -->
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
@@ -292,18 +304,31 @@
 				</repository>
 			</distributionManagement>
 		</profile>
-	</profiles>
-
+		<profile>
+			<id>sonatype</id>
 			<repositories>
 				<repository>
 					<id>nexus-snapshots</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
 					<releases>
 						<enabled>false</enabled>
 					</releases>
 					<snapshots>
 						<enabled>true</enabled>
+						<updatePolicy>always</updatePolicy>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>nexus-releases</id>
+					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
 					</snapshots>
 				</repository>
 			</repositories>
+		</profile>
+	</profiles>
 </project>

spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/MockedConfigChange.java

@@ -1,3 +1,20 @@
+/*
+ * 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.config.adapter;
 
 /**

spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/BeanFactoryUtilsTest.java

@@ -1,3 +1,20 @@
+/*
+ * 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.common.util;
 
 import org.junit.Assert;

spring-cloud-tencent-dependencies/pom.xml

@@ -70,7 +70,7 @@
 	</developers>
 
 	<properties>
-		<revision>1.9.0-Hoxton.SR12</revision>
+		<revision>1.11.1-Hoxton.SR12-SNAPSHOT</revision>
 
 		<!-- Dependencies -->
 		<polaris.version>1.10.5</polaris.version>

spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisContextGetHostTest.java

@@ -20,7 +20,6 @@ package com.tencent.cloud.polaris.context;
 import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
 import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
 import com.tencent.polaris.client.api.SDKContext;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.platform.commons.util.StringUtils;
 import org.junit.runner.RunWith;
@@ -30,6 +29,8 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = PolarisContextApplication.class,
 		properties = { "spring.config.location = classpath:bootstrap.yml" })
@@ -45,8 +46,12 @@ public class PolarisContextGetHostTest {
 	@Test
 	public void testGetConfigHost() {
 		String bindIP = polarisContext.getConfig().getGlobal().getAPI().getBindIP();
-		Assert.assertFalse(StringUtils.isBlank(bindIP));
-		Assert.assertEquals(bindIP, "192.168.1.1");
-		Assert.assertEquals(polarisContextProperties.getNamespace(), "dev");
+		assertThat(StringUtils.isBlank(bindIP)).isFalse();
+		assertThat(bindIP).isEqualTo("192.168.1.1");
+		assertThat(polarisContextProperties.getAddress()).isEqualTo("grpc://127.0.0.1:8091");
+		assertThat(polarisContextProperties.getLocalIpAddress()).isEqualTo("192.168.1.1");
+		assertThat(polarisContextProperties.getEnabled()).isTrue();
+		assertThat(polarisContextProperties.getNamespace()).isEqualTo("dev");
+		assertThat(polarisContextProperties.getService()).isEqualTo("TestApp");
 	}
 }

spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/config/PolarisContextAutoConfigurationTest.java

@@ -15,9 +15,8 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.context;
+package com.tencent.cloud.polaris.context.config;
 
-import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
 import com.tencent.polaris.client.api.SDKContext;
 import org.junit.Assert;
 import org.junit.Test;

spring-cloud-tencent-polaris-context/src/test/resources/bootstrap.yml

@@ -4,3 +4,5 @@ spring:
       local-ip-address: 192.168.1.1
       address: grpc://127.0.0.1:8091
       namespace: dev
+      service: TestApp
+      enabled: true

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementBootstrapConfiguration.java

@@ -1,3 +1,20 @@
+/*
+ * 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.rpc.enhancement.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;