Skip to content

optimize: add OkHttp and MockWebServer dependencies to resolve version confilcts#7934

Merged
funky-eyes merged 4 commits into
apache:2.xfrom
neronsoda:bugfix-okhttp
Jan 16, 2026
Merged

optimize: add OkHttp and MockWebServer dependencies to resolve version confilcts#7934
funky-eyes merged 4 commits into
apache:2.xfrom
neronsoda:bugfix-okhttp

Conversation

@neronsoda

@neronsoda neronsoda commented Jan 13, 2026

Copy link
Copy Markdown
Contributor

Ⅰ. Describe what this PR did

  1. Added okhttp version 4.9.3 property declaration
  2. Added okhttp and mockwebserver to <dependencyManagement> section in dependencies/pom.xml

Ⅱ. Does this pull request fix one issue?

fixes #7920

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

funky-eyes
funky-eyes reviewed Jan 14, 2026
View reviewed changes

@funky-eyes funky-eyes left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please register your PR in those two files :
https://github.com/apache/incubator-seata/blob/2.x/changes/zh-cn/2.x.md
https://github.com/apache/incubator-seata/blob/2.x/changes/en-us/2.x.md

@funky-eyes funky-eyes added this to the 2.7.0 milestone Jan 14, 2026
@funky-eyes funky-eyes added dependencies Pull requests that update a dependency file type: optimize labels Jan 14, 2026
@codecov

codecov Bot commented Jan 14, 2026 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 71.62%. Comparing base (1d4e811) to head (4baba00).
⚠️ Report is 1 commits behind head on 2.x.

Additional details and impacted files 
@@             Coverage Diff              @@
##                2.x    #7934      +/-   ##
============================================
+ Coverage     71.56%   71.62%   +0.05%     
  Complexity      884      884              
============================================
  Files          1300     1300              
  Lines         49701    49701              
  Branches       5895     5895              
============================================
+ Hits          35569    35598      +29     
+ Misses        11212    11185      -27     
+ Partials       2920     2918       -2

see 12 files with indirect coverage changes

Impacted file tree graph

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@maple525866 maple525866 changed the title Add OkHttp and MockWebServer dependencies to resolve version confilcts optimize: add OkHttp and MockWebServer dependencies to resolve version confilcts Jan 14, 2026
@neronsoda

neronsoda commented Jan 15, 2026

Copy link
Copy Markdown
Contributor Author

Please register your PR in those two files :
https://github.com/apache/incubator-seata/blob/2.x/changes/zh-cn/2.x.md
https://github.com/apache/incubator-seata/blob/2.x/changes/en-us/2.x.md

I’ll register my PR in both files by today :)

@funky-eyes funky-eyes added the first-time contributor first-time contributor label Jan 15, 2026
@neronsoda

neronsoda commented Jan 15, 2026

Copy link
Copy Markdown
Contributor Author

I've updated both files and committed the changes.
Please take a look :)

maple525866
maple525866 approved these changes Jan 15, 2026
View reviewed changes

@maple525866 maple525866 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

funky-eyes
funky-eyes approved these changes Jan 16, 2026
View reviewed changes

@funky-eyes funky-eyes left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@funky-eyes

funky-eyes commented Jan 16, 2026

Copy link
Copy Markdown
Contributor

Thank you for your contributions to Seata. If possible, please send your Dingtalk contact information to my email, and I will invite you to join the Seata developer group.
jianbin@apache.org

@funky-eyes funky-eyes merged commit a75a21e into apache:2.x Jan 16, 2026
11 checks passed
@neronsoda

neronsoda commented Jan 18, 2026

Copy link
Copy Markdown
Contributor Author

I’ve sent the email.
Please take a look when you have a moment :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@funky-eyes funky-eyes funky-eyes approved these changes
@maple525866 maple525866 maple525866 approved these changes

Assignees

No one assigned

Labels

dependencies Pull requests that update a dependency file first-time contributor first-time contributor type: optimize

Projects

None yet

Milestone

2.7.0

Development

Successfully merging this pull request may close these issues.

java.lang.String cannot be converted to okhttp3.MediaType

3 participants

@neronsoda @funky-eyes @maple525866