Skip to content

[backport] build(deps): Bump golang.org/x/net from 0.47.0 to 0.48.0 (#1234)#1236

Open
mergify[bot] wants to merge 2 commits intorelease/v1.6from
mergify/bp/release/v1.6/pr-1234
Open

[backport] build(deps): Bump golang.org/x/net from 0.47.0 to 0.48.0 (#1234)#1236
mergify[bot] wants to merge 2 commits intorelease/v1.6from
mergify/bp/release/v1.6/pr-1234

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 10, 2025

Bumps golang.org/x/net from 0.47.0 to 0.48.0.

Commits
  • 35e1306 go.mod: update golang.org/x dependencies
  • 7c36036 http2, webdav, websocket: fix %q verb uses with wrong type
  • ec11ecc trace: fix data race in RenderEvents
  • bff14c5 http2: don't PING a responsive server when resetting a stream
  • 88a6421 dns/dnsmessage: avoid use of "strings" and "math" in dns/dnsmessage
  • 123d099 http2: support net/http.Transport.NewClientConn
  • 346cc61 webdav: relax test to check for any redirect status, not just 301
  • See full diff in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

This is an automatic backport of pull request #1234 done by [Mergify](https://mergify.com).

@mergify mergify bot added conflicts PR is conflict with target branch v1.6.x Release v1.6.x labels Dec 10, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Dec 10, 2025

Cherry-pick of 474d4af has failed:

On branch mergify/bp/release/v1.6/pr-1234
Your branch is up to date with 'origin/release/v1.6'.

You are currently cherry-picking commit 474d4af.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot removed the conflicts PR is conflict with target branch label Dec 10, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Dec 10, 2025

❗❗❗
All commits in this PR must be signed off.
Please sign all commits by:

git rebase HEAD~1 --signoff
git push --force-with-lease origin mergify/bp/release/v1.6/pr-1234

@mergify
Copy link
Contributor Author

mergify bot commented Dec 10, 2025

Merge Protections

Your pull request matches the following merge protections and will not be merged until they are valid.

🟢 Enforce conventional commit

Wonderful, this rule succeeded.

Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/

  • title ~= ^(\[wip\]|\[backport\]|\[cherry-pick\])?( )?(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\(.+\))?:

🟢 Enforce verified commits

Wonderful, this rule succeeded.

Make sure that we have verified commits

  • #commits-unverified = 0

🟢 Enforce linear history

Wonderful, this rule succeeded.

Make sure that we have a linear history, no merge commits are allowed

  • linear-history

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.47.0 to 0.48.0.
- [Commits](golang/net@v0.47.0...v0.48.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-version: 0.48.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 474d4af)

# Conflicts:
#	go.mod
#	go.sum
Signed-off-by: Lin Yang <reaver@flomesh.io>
@i0r3k i0r3k force-pushed the mergify/bp/release/v1.6/pr-1234 branch from 3fa56b8 to bc22497 Compare January 3, 2026 03:05
Signed-off-by: Lin Yang <reaver@flomesh.io>
@i0r3k i0r3k added area/control-plane Task/Issue related to control plane change/dependencies Pull requests that update a dependency file kind/enhancement New feature or request priority/P2 P2 priority size/XS 1 day labels Jan 7, 2026
@i0r3k i0r3k self-assigned this Jan 7, 2026
@i0r3k i0r3k added this to the v1.6.0 milestone Jan 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/control-plane Task/Issue related to control plane change/dependencies Pull requests that update a dependency file kind/enhancement New feature or request priority/P2 P2 priority size/XS 1 day v1.6.x Release v1.6.x

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant