diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7d9d0022d..f262be83f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -28,5 +28,5 @@ fixes # ## Checklist (Optional) -- [ ] Will Pull Request to branch of 2020.0 and hoxton. +- [ ] Will Pull Request to branch of 2022.0 and 2020.0. - [ ] Add documentation in javadoc or comment below the PR if necessary. diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 721286f3d..655cd5aaf 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -27,7 +27,7 @@ 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: diff --git a/.github/workflows/junit_test.yml b/.github/workflows/junit_test.yml index d0200a5ff..13f2c7aeb 100644 --- a/.github/workflows/junit_test.yml +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 14cf38591..06c1f8175 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,33 +1,3 @@ # Change Log --- -- [Optimize:optimize SpringValueProcessor.](https://github.com/Tencent/spring-cloud-tencent/pull/655) -- [Optimize/optimize annotation.](https://github.com/Tencent/spring-cloud-tencent/pull/672) -- [Optimize: Register the service with the ProviderAPI#registerInstance method.](https://github.com/Tencent/spring-cloud-tencent/pull/686) -- [docs:update PR template.](https://github.com/Tencent/spring-cloud-tencent/pull/690) -- [enhancement: revert default value when the field is deleted in @ConfigurationProperties bean](https://github.com/Tencent/spring-cloud-tencent/issues/681) -- [Feature:support multi register and discovery both to nacos and polaris.](https://github.com/Tencent/spring-cloud-tencent/pull/693) -- [Code optimize & add junit tests.](https://github.com/Tencent/spring-cloud-tencent/pull/701) -- [Optimize: remote deprecated method](https://github.com/Tencent/spring-cloud-tencent/pull/697) -- [Test:support environment variable metadata test](https://github.com/Tencent/spring-cloud-tencent/pull/698) -- [Test: remote deprecated method in test](https://github.com/Tencent/spring-cloud-tencent/pull/706) -- [upgrade protobuf-java.version to 3.21.7](https://github.com/Tencent/spring-cloud-tencent/pull/715) -- [docs:update README.](https://github.com/Tencent/spring-cloud-tencent/pull/718) -- [Fix:fix javadoc.](https://github.com/Tencent/spring-cloud-tencent/pull/721) -- [Code optimization & correct comment](https://github.com/Tencent/spring-cloud-tencent/pull/722) -- [fix:fix discovery junit.](https://github.com/Tencent/spring-cloud-tencent/pull/730) -- [Test:add sct-stater-polaris-router juint.](https://github.com/Tencent/spring-cloud-tencent/pull/731) -- [adapt polaris-java 1.10.1 version](https://github.com/Tencent/spring-cloud-tencent/pull/746) -- [Optimize: change RouteArgument.buildCustom to RouteArgument.fromLabel](https://github.com/Tencent/spring-cloud-tencent/pull/749) -- [Optimize: get service instances by Flux.blockLast() to resolve concurrent problem](https://github.com/Tencent/spring-cloud-tencent/pull/764) -- [Fix issue: prompt no registration if web dependence was not imported.](https://github.com/Tencent/spring-cloud-tencent/pull/772) -- [Bugfix: fix reactor concurrent bug when get instances & fix spring-retry fuse not working bug](https://github.com/Tencent/spring-cloud-tencent/pull/774) -- [Standardize the name of method to create bean.](https://github.com/Tencent/spring-cloud-tencent/pull/779) -- [set reporter.enabled default to true](https://github.com/Tencent/spring-cloud-tencent/pull/784) -- [fix:fix nacos enabled condition bugs.](https://github.com/Tencent/spring-cloud-tencent/pull/793) -- [fix:fix instance's weight hard code to 100 bug.](https://github.com/Tencent/spring-cloud-tencent/pull/802) -- [feat:update getPort method of PolarisRegistration.](https://github.com/Tencent/spring-cloud-tencent/pull/803) -- [fix:fix some compile output issues.](https://github.com/Tencent/spring-cloud-tencent/pull/814) -- [Feature: upgrade framework version.](https://github.com/Tencent/spring-cloud-tencent/pull/815) -- [fix:nacos & polaris discovery](https://github.com/Tencent/spring-cloud-tencent/pull/816) -- [fix:fix router parameter not checking bug.](https://github.com/Tencent/spring-cloud-tencent/pull/826) diff --git a/changes/changes-1.9.0.md b/changes/changes-1.9.0.md new file mode 100644 index 000000000..14cf38591 --- /dev/null +++ b/changes/changes-1.9.0.md @@ -0,0 +1,33 @@ +# Change Log +--- + +- [Optimize:optimize SpringValueProcessor.](https://github.com/Tencent/spring-cloud-tencent/pull/655) +- [Optimize/optimize annotation.](https://github.com/Tencent/spring-cloud-tencent/pull/672) +- [Optimize: Register the service with the ProviderAPI#registerInstance method.](https://github.com/Tencent/spring-cloud-tencent/pull/686) +- [docs:update PR template.](https://github.com/Tencent/spring-cloud-tencent/pull/690) +- [enhancement: revert default value when the field is deleted in @ConfigurationProperties bean](https://github.com/Tencent/spring-cloud-tencent/issues/681) +- [Feature:support multi register and discovery both to nacos and polaris.](https://github.com/Tencent/spring-cloud-tencent/pull/693) +- [Code optimize & add junit tests.](https://github.com/Tencent/spring-cloud-tencent/pull/701) +- [Optimize: remote deprecated method](https://github.com/Tencent/spring-cloud-tencent/pull/697) +- [Test:support environment variable metadata test](https://github.com/Tencent/spring-cloud-tencent/pull/698) +- [Test: remote deprecated method in test](https://github.com/Tencent/spring-cloud-tencent/pull/706) +- [upgrade protobuf-java.version to 3.21.7](https://github.com/Tencent/spring-cloud-tencent/pull/715) +- [docs:update README.](https://github.com/Tencent/spring-cloud-tencent/pull/718) +- [Fix:fix javadoc.](https://github.com/Tencent/spring-cloud-tencent/pull/721) +- [Code optimization & correct comment](https://github.com/Tencent/spring-cloud-tencent/pull/722) +- [fix:fix discovery junit.](https://github.com/Tencent/spring-cloud-tencent/pull/730) +- [Test:add sct-stater-polaris-router juint.](https://github.com/Tencent/spring-cloud-tencent/pull/731) +- [adapt polaris-java 1.10.1 version](https://github.com/Tencent/spring-cloud-tencent/pull/746) +- [Optimize: change RouteArgument.buildCustom to RouteArgument.fromLabel](https://github.com/Tencent/spring-cloud-tencent/pull/749) +- [Optimize: get service instances by Flux.blockLast() to resolve concurrent problem](https://github.com/Tencent/spring-cloud-tencent/pull/764) +- [Fix issue: prompt no registration if web dependence was not imported.](https://github.com/Tencent/spring-cloud-tencent/pull/772) +- [Bugfix: fix reactor concurrent bug when get instances & fix spring-retry fuse not working bug](https://github.com/Tencent/spring-cloud-tencent/pull/774) +- [Standardize the name of method to create bean.](https://github.com/Tencent/spring-cloud-tencent/pull/779) +- [set reporter.enabled default to true](https://github.com/Tencent/spring-cloud-tencent/pull/784) +- [fix:fix nacos enabled condition bugs.](https://github.com/Tencent/spring-cloud-tencent/pull/793) +- [fix:fix instance's weight hard code to 100 bug.](https://github.com/Tencent/spring-cloud-tencent/pull/802) +- [feat:update getPort method of PolarisRegistration.](https://github.com/Tencent/spring-cloud-tencent/pull/803) +- [fix:fix some compile output issues.](https://github.com/Tencent/spring-cloud-tencent/pull/814) +- [Feature: upgrade framework version.](https://github.com/Tencent/spring-cloud-tencent/pull/815) +- [fix:nacos & polaris discovery](https://github.com/Tencent/spring-cloud-tencent/pull/816) +- [fix:fix router parameter not checking bug.](https://github.com/Tencent/spring-cloud-tencent/pull/826) diff --git a/pom.xml b/pom.xml index 48e0fcac2..3173106d7 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ - 1.9.0-2021.0.5 + 1.10.0-2021.0.5-SNAPSHOT 2021.0.5 @@ -310,18 +310,32 @@ + + sonatype + + + nexus-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + false + + + true + always + + + + nexus-releases + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + true + + + false + + + + - - - nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - false - - - true - - - diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 1e2e1dba5..35a424de6 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -70,7 +70,7 @@ - 1.9.0-2021.0.5 + 1.10.0-2021.0.5-SNAPSHOT 1.10.5