Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick bug fix from master into 3.1.0 branch #334

Merged
merged 9 commits into from
Apr 26, 2024

Conversation

aofall
Copy link
Contributor

@aofall aofall commented Apr 19, 2024

What is the purpose of the change

  1. fix: protobuf type lose field when deepCopy inJvmInvoker ( [Dubbo-267] Fix protobuf type lose field when deepCopy inJvmInvoker … #268) by @vio-lin
  2. fix: dubbo-registry-dns resource leak (fix: dubbo-registry-dns resource leak #308)
  3. fix: test lib (fix test lib #310) by @wcy666103
  4. fix: redis connection do not close and return to connection pool (fix: redis connection do not close and return to connection pool #311)
  5. build: Add Unit test for Windows platform
  6. chore: Add dependabot config

Brief changelog

Cherry pick bug fix from master into 3.1.0 branch

Verifying this change

XXXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a GITHUB_issue field for the change (usually before
    you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address
    just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit
    in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency
    exist. If the new feature or significant change is committed, please remember to add sample
    in dubbo samples project.
  • Run mvn clean install -DskipTests=false & mvn clean test-compile failsafe:integration-test to make sure
    unit-test and integration-test pass.
  • If this contribution is large, please follow
    the Software Donation Guide.

vio-lin and others added 9 commits April 19, 2024 14:08
* fix: dubbo-registry-dns memory leak && add try catch

* revert junit

(cherry picked from commit b3033de)
* fix test lib

* remove useless dependency

* remove useless dependency

* fix bad test

* TimeoutException Increase time

* Revert "TimeoutException Increase time"

This reverts commit 5e5bb32.

* add MinaClientToServerTest disable

(cherry picked from commit f38363f)
@aofall aofall changed the title Cherry-pick bug fix from master to 3.1.0 branch Cherry-pick bug fix from master into 3.1.0 branch Apr 19, 2024
Copy link
Member

@songxiaosheng songxiaosheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@songxiaosheng songxiaosheng merged commit a227f52 into apache:3.1.0 Apr 26, 2024
16 checks passed
songxiaosheng pushed a commit that referenced this pull request May 9, 2024
* upgrade dubbo to the 3.1 latest version in 3.1.0 branch (#293)

* upgrade dubbo to the 3.1.x the latest version

* fix(#207): Dubbo Redis register support select databases

(cherry picked from commit 0f42ecd)

* Bump version && fix test case failed (#303)

* Remove dubbo-gateway-common module

because the class ByteAccessor since dubbo 3.2.0, but this branch(3.1.0) based on the dubbo 3.1.x

* Bump the extensions version to 3.1.0 && revision the pom.xml

* Adjust test ci workspace

* add GitHub Actions workflow file

* add GitHub Actions workflow file

* build: add some ignore file for license check

* chore: fix missed or incorrect ASF license

* fix multi os prepare test failed

* fix test case failed

* try to fix conformance test failed

* try to fix conformance test failed

* fix ci build failed

* Cherry-pick bug fix from master into 3.1.0 branch (#334)

* [Dubbo-267] Fix protobuf type lose field when deepCopy inJvmInvoker Class. (#268)

* fix: dubbo-registry-dns resource leak (#308)

* fix: dubbo-registry-dns memory leak && add try catch

* revert junit

(cherry picked from commit b3033de)

* fix: redis connection do not close and return to connection pool (#311)

(cherry picked from commit cbad15d)

* fix test lib (#310)

* fix test lib

* remove useless dependency

* remove useless dependency

* fix bad test

* TimeoutException Increase time

* Revert "TimeoutException Increase time"

This reverts commit 5e5bb32.

* add MinaClientToServerTest disable

(cherry picked from commit f38363f)

* build: add Windows platform unit test for CI && add dependabot config

* chore: create etcd for each unit test

* chore: already check license by apache skywalking-eyes so skip rat-license check

* Revert "chore: already check license by apache skywalking-eyes so skip rat-license check"

This reverts commit 98d627b.

* fix: rat-check failed

---------

Co-authored-by: MaruHibiki <1807180752@qq.com>
Co-authored-by: 王聪洋 <56506697+wcy666103@users.noreply.github.com>

* update: compatible dubbo 3.0.x

Remove dubbo-registry-dns because ReflectionBasedServiceDiscovery since dubbo 3.1

* ci: adjust build tools use dubbo 3.0

* ci: Upload coverage to Codecov

---------

Co-authored-by: MaruHibiki <1807180752@qq.com>
Co-authored-by: 王聪洋 <56506697+wcy666103@users.noreply.github.com>
@aofall aofall deleted the 3.1.0-bugfix branch November 15, 2024 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants