From 3dbc3afd3b2737174f977b0acfc96ce006797a37 Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Mon, 13 Feb 2023 11:58:35 +0800 Subject: [PATCH] begin 1.10.0. --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/codecov.yml | 2 +- .github/workflows/junit_test.yml | 2 +- CHANGELOG.md | 26 --------------- changes/changes-1.9.0.md | 29 ++++++++++++++++ pom.xml | 40 +++++++++++++++-------- spring-cloud-tencent-dependencies/pom.xml | 2 +- 7 files changed, 60 insertions(+), 43 deletions(-) create mode 100644 changes/changes-1.9.0.md 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 30cbe61f9..06c1f8175 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,29 +1,3 @@ # Change Log --- -- [Optimize:optimize SpringValueProcessor.](https://github.com/Tencent/spring-cloud-tencent/pull/668) -- [Optimize: Register the service with the ProviderAPI#registerInstance method.](https://github.com/Tencent/spring-cloud-tencent/pull/685) -- [Optimize:optimize spring annotation.](https://github.com/Tencent/spring-cloud-tencent/pull/688) -- [docs:update PR template.](https://github.com/Tencent/spring-cloud-tencent/pull/691) -- [Code optimize & add junit tests.](https://github.com/Tencent/spring-cloud-tencent/pull/703) -- [Test:support environment variable metadata test](https://github.com/Tencent/spring-cloud-tencent/pull/710) -- [upgrade protobuf-java.version to 3.21.7](https://github.com/Tencent/spring-cloud-tencent/pull/716) -- [docs:update README.](https://github.com/Tencent/spring-cloud-tencent/pull/719) -- [Code optimization & correct comment](https://github.com/Tencent/spring-cloud-tencent/pull/723) -- [fix:fix javadoc.](https://github.com/Tencent/spring-cloud-tencent/pull/726) -- [fix:fix discovery junit.](https://github.com/Tencent/spring-cloud-tencent/pull/728) -- [adapt polaris-java 1.10.1 version](https://github.com/Tencent/spring-cloud-tencent/pull/748) -- [Optimize: change RouteArgument.buildCustom to RouteArgument.fromLabel](https://github.com/Tencent/spring-cloud-tencent/pull/750) -- [Optimize: support delete config for ConfigurationProperties bean](https://github.com/Tencent/spring-cloud-tencent/pull/755) -- [Bugfix: get service instances by Flux.blockLast() to resolve concurrent problem](https://github.com/Tencent/spring-cloud-tencent/pull/763) -- [Test:add sct-stater-polaris-router juint.](https://github.com/Tencent/spring-cloud-tencent/pull/767) -- [Feature: support nacos registry](https://github.com/Tencent/spring-cloud-tencent/pull/757) -- [Bugfix: fix reactor concurrent bug when get instances & fix spring-retry fuse not working bug](https://github.com/Tencent/spring-cloud-tencent/pull/775) -- [Fix issue: prompt no registration if web dependence was not imported.](https://github.com/Tencent/spring-cloud-tencent/pull/777) -- [set reporter.enabled default to true](https://github.com/Tencent/spring-cloud-tencent/pull/786) -- [fix:fix nacos enabled condition bugs.](https://github.com/Tencent/spring-cloud-tencent/pull/794) -- [fix:fix instance's weight hard code to 100 bug.](https://github.com/Tencent/spring-cloud-tencent/pull/801) -- [feat:update getPort method of PolarisRegistration.](https://github.com/Tencent/spring-cloud-tencent/pull/804) -- [fix:fix some compile output issues.](https://github.com/Tencent/spring-cloud-tencent/pull/813) -- [fix:nacos & polaris discovery](https://github.com/Tencent/spring-cloud-tencent/pull/819) -- [fix:fix router parameter not checking bug.](https://github.com/Tencent/spring-cloud-tencent/pull/827) diff --git a/changes/changes-1.9.0.md b/changes/changes-1.9.0.md new file mode 100644 index 000000000..30cbe61f9 --- /dev/null +++ b/changes/changes-1.9.0.md @@ -0,0 +1,29 @@ +# Change Log +--- + +- [Optimize:optimize SpringValueProcessor.](https://github.com/Tencent/spring-cloud-tencent/pull/668) +- [Optimize: Register the service with the ProviderAPI#registerInstance method.](https://github.com/Tencent/spring-cloud-tencent/pull/685) +- [Optimize:optimize spring annotation.](https://github.com/Tencent/spring-cloud-tencent/pull/688) +- [docs:update PR template.](https://github.com/Tencent/spring-cloud-tencent/pull/691) +- [Code optimize & add junit tests.](https://github.com/Tencent/spring-cloud-tencent/pull/703) +- [Test:support environment variable metadata test](https://github.com/Tencent/spring-cloud-tencent/pull/710) +- [upgrade protobuf-java.version to 3.21.7](https://github.com/Tencent/spring-cloud-tencent/pull/716) +- [docs:update README.](https://github.com/Tencent/spring-cloud-tencent/pull/719) +- [Code optimization & correct comment](https://github.com/Tencent/spring-cloud-tencent/pull/723) +- [fix:fix javadoc.](https://github.com/Tencent/spring-cloud-tencent/pull/726) +- [fix:fix discovery junit.](https://github.com/Tencent/spring-cloud-tencent/pull/728) +- [adapt polaris-java 1.10.1 version](https://github.com/Tencent/spring-cloud-tencent/pull/748) +- [Optimize: change RouteArgument.buildCustom to RouteArgument.fromLabel](https://github.com/Tencent/spring-cloud-tencent/pull/750) +- [Optimize: support delete config for ConfigurationProperties bean](https://github.com/Tencent/spring-cloud-tencent/pull/755) +- [Bugfix: get service instances by Flux.blockLast() to resolve concurrent problem](https://github.com/Tencent/spring-cloud-tencent/pull/763) +- [Test:add sct-stater-polaris-router juint.](https://github.com/Tencent/spring-cloud-tencent/pull/767) +- [Feature: support nacos registry](https://github.com/Tencent/spring-cloud-tencent/pull/757) +- [Bugfix: fix reactor concurrent bug when get instances & fix spring-retry fuse not working bug](https://github.com/Tencent/spring-cloud-tencent/pull/775) +- [Fix issue: prompt no registration if web dependence was not imported.](https://github.com/Tencent/spring-cloud-tencent/pull/777) +- [set reporter.enabled default to true](https://github.com/Tencent/spring-cloud-tencent/pull/786) +- [fix:fix nacos enabled condition bugs.](https://github.com/Tencent/spring-cloud-tencent/pull/794) +- [fix:fix instance's weight hard code to 100 bug.](https://github.com/Tencent/spring-cloud-tencent/pull/801) +- [feat:update getPort method of PolarisRegistration.](https://github.com/Tencent/spring-cloud-tencent/pull/804) +- [fix:fix some compile output issues.](https://github.com/Tencent/spring-cloud-tencent/pull/813) +- [fix:nacos & polaris discovery](https://github.com/Tencent/spring-cloud-tencent/pull/819) +- [fix:fix router parameter not checking bug.](https://github.com/Tencent/spring-cloud-tencent/pull/827) diff --git a/pom.xml b/pom.xml index a72cd104d..a95dec40b 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ - 1.9.0-2020.0.5 + 1.10.0-2020.0.5-SNAPSHOT 2020.0.5 @@ -299,18 +299,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 d9c80c616..fef009b06 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -70,7 +70,7 @@ - 1.9.0-2020.0.5 + 1.10.0-2020.0.5-SNAPSHOT 1.10.5